From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 22 Jun 2015 12:56:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2
X-Git-Tag: oc-android-1.7.2~1^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8c5b2b7b1360f425521d287528e2d7b157cf5eac

Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2
---

8c5b2b7b1360f425521d287528e2d7b157cf5eac