From: masensio <masensio@solidgear.es>
Date: Mon, 28 Sep 2015 10:33:47 +0000 (+0200)
Subject: Merge branch 'release-1.8'
X-Git-Tag: oc-android-1.8~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ee9aa68d2393521031ae73196f577dae12f40ec8?ds=inline;hp=--cc

Merge branch 'release-1.8'
---

ee9aa68d2393521031ae73196f577dae12f40ec8