From: masensio Date: Wed, 25 Feb 2015 07:56:00 +0000 (+0100) Subject: Merge branch 'develop' into cancel_transfer_for_deleted_users X-Git-Tag: oc-android-1.7.1_signed^2~40^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2abceb0ed5abefefc3655fb27d234b81de3873ab?ds=inline;hp=--cc Merge branch 'develop' into cancel_transfer_for_deleted_users --- 2abceb0ed5abefefc3655fb27d234b81de3873ab