Merge branch 'develop' into login_toggle_password_icon
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 24 May 2013 08:36:21 +0000 (10:36 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 24 May 2013 08:36:21 +0000 (10:36 +0200)
commit7160a49e20c34b3ee34105526eed50e124979834
tree5b765bee80bf2bae3c7f6ba7953d4888457ca9fc
parent69b527c39d82546f053d7ef2b9a1f094f1b4a94e
parentb8b60d844fa6922bef06c2274902bcc48d715c41
Merge branch 'develop' into login_toggle_password_icon
res/layout-land/account_setup.xml
res/layout/account_setup.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java