From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 18 Sep 2014 12:27:13 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.6.0
X-Git-Tag: oc-android-1.7.0_signed~15^2~35
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/aa354e5d73d2e1777b93e957220990d145f3b6ba?ds=inline;hp=aa354e5d73d2e1777b93e957220990d145f3b6ba

Merge branch 'develop' into release-1.6.0
---