From: masensio <masensio@solidgear.es>
Date: Thu, 3 Dec 2015 08:25:06 +0000 (+0100)
Subject: Merge branch 'release-1.9' into stable
X-Git-Tag: oc-android-1.9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/46e10554da1aeb37315ef6a186c3db6169615df0?hp=--cc

Merge branch 'release-1.9' into stable
---

0794871f881860364b787278a1fec85cf4ed3569