From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 3 Feb 2015 11:46:23 +0000 (+0100)
Subject: Merge branch 'master' into release-1.7.0
X-Git-Tag: oc-android-1.7.0_signed~15
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5116bd99e26954fb83621863ff26e351d0a08cfd?ds=inline

Merge branch 'master' into release-1.7.0
---

5116bd99e26954fb83621863ff26e351d0a08cfd