From: masensio <masensio@solidgear.es>
Date: Tue, 3 Feb 2015 10:25:09 +0000 (+0100)
Subject: Merge branch 'develop' into cancel_transfer_for_deleted_users
X-Git-Tag: oc-android-1.7.1_signed^2~40^2~16
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b64fd4cc5b9d702f18cbc27ed650ba604d0757dd?ds=inline

Merge branch 'develop' into cancel_transfer_for_deleted_users
---

b64fd4cc5b9d702f18cbc27ed650ba604d0757dd