Merge branch 'develop' into fixing_travis
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Apr 2014 10:31:44 +0000 (12:31 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 8 Apr 2014 10:31:44 +0000 (12:31 +0200)

Trivial merge