From: masensio <masensio@solidgear.es>
Date: Wed, 30 Sep 2015 08:45:20 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Tag: oc-android-1.9^2~65
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5a8f605ed99317b8baaedcadc24602d99db665e2?ds=inline;hp=--cc

Merge branch 'stable'
---

5a8f605ed99317b8baaedcadc24602d99db665e2