From: masensio Date: Wed, 18 Feb 2015 11:26:49 +0000 (+0100) Subject: Merge branch 'develop' into cancel_transfer_for_deleted_users X-Git-Tag: oc-android-1.7.1_signed^2~40^2~10 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4984d909f21ca2eb45d730b280249578cb766a06?ds=sidebyside;hp=--cc Merge branch 'develop' into cancel_transfer_for_deleted_users --- 4984d909f21ca2eb45d730b280249578cb766a06