From: masensio <masensio@solidgear.es>
Date: Tue, 7 Jul 2015 11:15:35 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.8~74
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/629cff2d3f8e7641f86f02452851cc0194f7c830?hp=--cc

Merge branch 'master' into develop
---

629cff2d3f8e7641f86f02452851cc0194f7c830