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

Merge branch 'setup_multiaccount' into setup_app_name
---

ab82a818d2703a45a6b6588e5d2637f6045582bd