Merge remote-tracking branch 'origin/develop' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Sat, 17 Aug 2013 08:24:29 +0000 (10:24 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Sat, 17 Aug 2013 08:24:29 +0000 (10:24 +0200)

Trivial merge