Merge remote-tracking branch 'origin/develop' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 19 Jun 2013 15:03:13 +0000 (17:03 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 19 Jun 2013 15:03:13 +0000 (17:03 +0200)

Trivial merge