From: masensio <masensio@solidgear.es>
Date: Fri, 18 Oct 2013 10:32:22 +0000 (+0200)
Subject: Merge branch 'setup_multiaccount' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/31f6e61f894efd0867d1a34c8d3cb53d7bb5fc4a?hp=31f6e61f894efd0867d1a34c8d3cb53d7bb5fc4a

Merge branch 'setup_multiaccount' into setup_app_name

Conflicts:
	res/values/setup.xml
	src/com/owncloud/android/authentication/AccountAuthenticator.java
---