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)
commit9b4da8439ad53a28a45bdca5caed77774c5baad8
tree03600af0047ad48f9c3142c8a16dbcc5970ab24a
parent2b3f7c548908bd7ec97037400dc65447b6137937
parentbfbb733b67ead47878ccef0888ec27b636b71e17
Merge branch 'develop' into oauth_login

Conflicts:
res/layout-land/account_setup.xml
res/layout/account_setup.xml
res/layout-land/account_setup.xml
res/layout/account_setup.xml
res/values/strings.xml