From: masensio Date: Tue, 24 Feb 2015 13:19:41 +0000 (+0100) Subject: Merge branch 'develop' into cancel_transfer_for_deleted_users X-Git-Tag: oc-android-1.7.1_signed^2~40^2~3 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2d697473a1be0d57dcc9c4412749fd1e290d0e07 Merge branch 'develop' into cancel_transfer_for_deleted_users --- 2d697473a1be0d57dcc9c4412749fd1e290d0e07