From: masensio Date: Fri, 7 Feb 2014 07:51:48 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/develop' into share_link__unshare_file X-Git-Tag: oc-android-1.5.5~35^2~18 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ba81538da65129ded768864116678ac93753a0ae Merge remote-tracking branch 'origin/develop' into share_link__unshare_file --- ba81538da65129ded768864116678ac93753a0ae