Merge remote-tracking branch 'origin/fixing_travis' into fixing_travis
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Apr 2014 07:23:29 +0000 (09:23 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Apr 2014 07:23:29 +0000 (09:23 +0200)

Trivial merge