From: masensio <masensio@solidgear.es>
Date: Tue, 7 Apr 2015 12:06:32 +0000 (+0200)
Subject: Merge branch 'release-1.7.1'
X-Git-Tag: oc-android-1.7.1_signed^0
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2444e4254ccf574d057205640c93d1f2fba740e0?ds=inline;hp=--cc

Merge branch 'release-1.7.1'
---

2444e4254ccf574d057205640c93d1f2fba740e0