From: masensio <masensio@solidgear.es>
Date: Tue, 10 Mar 2015 13:27:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/develop' into share_password_support
X-Git-Tag: oc-android-1.7.1_signed^2~27^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/01483a38bf667e626b66c39604b6c9576afec206?hp=-c

Merge remote-tracking branch 'origin/develop' into share_password_support
---

01483a38bf667e626b66c39604b6c9576afec206