Merge branch 'develop' into oauth_login
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 3 May 2013 08:24:20 +0000 (10:24 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 3 May 2013 08:24:20 +0000 (10:24 +0200)
Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml


No differences found