From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 9 Jul 2014 10:27:35 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.5.8
X-Git-Tag: oc-android-1.7.0_signed~125^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/49c69609eaba304a740b1a8dbd37e619d0fb82cf?ds=inline

Merge branch 'develop' into release-1.5.8
---

49c69609eaba304a740b1a8dbd37e619d0fb82cf