From: masensio <masensio@solidgear.es>
Date: Mon, 7 Oct 2013 12:36:43 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.4.6
X-Git-Tag: oc-android-1.4.6~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d4a020e3380aa5876cf3680bb2636a75373c4985

Merge branch 'develop' into release-1.4.6
---

d4a020e3380aa5876cf3680bb2636a75373c4985