From: masensio <masensio@solidgear.es>
Date: Fri, 6 Mar 2015 09:19:06 +0000 (+0100)
Subject: Merge branch 'develop' into share_password_support
X-Git-Tag: oc-android-1.7.1_signed^2~27^2~8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/82fa95fe43a82a294ef1212980ca9a32a8c50283

Merge branch 'develop' into share_password_support
---

82fa95fe43a82a294ef1212980ca9a32a8c50283