From: David A. Velasco Date: Thu, 6 Feb 2014 14:13:40 +0000 (+0100) Subject: Merge branch 'develop' into share_link__new_share X-Git-Tag: oc-android-1.5.5~58^2~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/62c382b1dcbac51eee1efa5854f5664ef3313d1b?ds=inline;hp=--cc Merge branch 'develop' into share_link__new_share --- 62c382b1dcbac51eee1efa5854f5664ef3313d1b