From: masensio Date: Mon, 16 Feb 2015 07:51:30 +0000 (+0100) Subject: Merge branch 'develop' into cancel_transfer_for_deleted_users X-Git-Tag: oc-android-1.7.1_signed^2~40^2~12 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3bed5fea7aed571f8b5eaf47254464ba5a639f32?hp=--cc Merge branch 'develop' into cancel_transfer_for_deleted_users --- 3bed5fea7aed571f8b5eaf47254464ba5a639f32