From: masensio <masensio@solidgear.es>
Date: Tue, 18 Aug 2015 08:16:13 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.8~43
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/95db3421f64f2f1dd335757155b1592f474ccb9a

Merge branch 'master' into develop
---

95db3421f64f2f1dd335757155b1592f474ccb9a