From: masensio <masensio@solidgear.es>
Date: Thu, 3 Dec 2015 11:50:01 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: sd-android-1.9^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d0b5d397c44e9d3fbae2ad946137e925bbc91cb7?ds=inline;hp=--cc

Merge branch 'stable'
---

d0b5d397c44e9d3fbae2ad946137e925bbc91cb7