From: masensio Date: Mon, 17 Mar 2014 12:44:32 +0000 (+0100) Subject: Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop X-Git-Tag: oc-android-1.5.5~5^2~8^2~4 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9284d44907f727dc0a101c3239f0a5a01d904d44?ds=inline;hp=--cc Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop --- 9284d44907f727dc0a101c3239f0a5a01d904d44