Merge branch 'setup_multiaccount' into setup_app_name
authormasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 10:32:22 +0000 (12:32 +0200)
committermasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 10:32:22 +0000 (12:32 +0200)
commit31f6e61f894efd0867d1a34c8d3cb53d7bb5fc4a
tree20a2a283121d67d5501ef37bf928556c0e107a21
parentea7f8fe49152fee3d92f1762d0e6538fa081c9d8
parent152ab88d9098b9eb22bf8f345510c7e66a861e39
Merge branch 'setup_multiaccount' into setup_app_name

Conflicts:
res/values/setup.xml
src/com/owncloud/android/authentication/AccountAuthenticator.java
res/values/setup.xml
res/values/strings.xml
src/com/owncloud/android/authentication/AccountAuthenticator.java
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/AccountSelectActivity.java