From: masensio <masensio@solidgear.es>
Date: Mon, 6 Jul 2015 11:55:36 +0000 (+0200)
Subject: Merge branch 'release-1.7.2'
X-Git-Tag: oc-android-1.7.2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/21ec36e39ff79217886a55045611598295c08322?ds=inline;hp=--cc

Merge branch 'release-1.7.2'
---

21ec36e39ff79217886a55045611598295c08322