From: masensio <masensio@solidgear.es>
Date: Fri, 20 Feb 2015 12:20:48 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.1_signed^2~46
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/83f990e49bb95c64c928126adb8e13113718c3fb

Merge branch 'master' into develop
---

83f990e49bb95c64c928126adb8e13113718c3fb