From: jabarros Date: Thu, 8 Jan 2015 13:26:38 +0000 (+0100) Subject: Merge branch 'download_folder' into download_folder__fixing_recursive_cancellation X-Git-Tag: oc-android-1.7.0_signed~23^2~15^2~3 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/46d045fd62a7637baa84561ccf2ccb726a02f607?ds=inline;hp=--cc Merge branch 'download_folder' into download_folder__fixing_recursive_cancellation --- 46d045fd62a7637baa84561ccf2ccb726a02f607