From: masensio <masensio@solidgear.es>
Date: Thu, 13 Mar 2014 09:39:22 +0000 (+0100)
Subject: Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop
X-Git-Tag: oc-android-1.5.5~5^2~8^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2ab9496b6e6bba15751c28295e9fd06c06aade6a?ds=inline;hp=-c

Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop
---

2ab9496b6e6bba15751c28295e9fd06c06aade6a