From: masensio <masensio@solidgear.es>
Date: Fri, 18 Oct 2013 08:33:26 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.4.6
X-Git-Tag: oc-android-1.4.6^0
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/194a7360f88e309608b990e52674ca2f884e6d0a?ds=inline;hp=--cc

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

194a7360f88e309608b990e52674ca2f884e6d0a