Merge branch 'setup_multiaccount' into setup_app_name
authormasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 08:22:18 +0000 (10:22 +0200)
committermasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 08:22:18 +0000 (10:22 +0200)
Conflicts:
src/com/owncloud/android/ui/activity/AccountSelectActivity.java


No differences found