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

Merge branch 'setup_multiaccount' into setup_app_name

Conflicts:
	src/com/owncloud/android/ui/activity/AccountSelectActivity.java
---