Merge remote-tracking branch 'origin/develop' into check_account_existance_in_gallery
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 17 Jun 2013 10:28:42 +0000 (12:28 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 17 Jun 2013 10:28:42 +0000 (12:28 +0200)

Trivial merge