Merge branch 'develop' into login_view_layout_improvements
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 May 2013 10:54:30 +0000 (12:54 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 May 2013 10:54:30 +0000 (12:54 +0200)

Trivial merge