From: purigarcia <pgarcia@solidgear.es>
Date: Mon, 9 Mar 2015 08:21:38 +0000 (+0100)
Subject: Merge branch 'develop' into share_password_support
X-Git-Tag: oc-android-1.7.1_signed^2~27^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/151c70c4437f1210171a5c76501d609aeefb93e9?ds=sidebyside

Merge branch 'develop' into share_password_support
---

151c70c4437f1210171a5c76501d609aeefb93e9