Merge branch 'develop' into check_account_existance_in_gallery
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 3 Jul 2013 08:06:37 +0000 (10:06 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 3 Jul 2013 08:06:37 +0000 (10:06 +0200)

Trivial merge