From: masensio Date: Wed, 29 Jan 2014 10:06:48 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/develop' into share_link_show_shared_files X-Git-Tag: oc-android-1.5.5~35^2~43^2^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/063ec9eff5b80ef9f8fd9ff3c400fae24c70996c?ds=inline;hp=--cc Merge remote-tracking branch 'origin/develop' into share_link_show_shared_files --- 063ec9eff5b80ef9f8fd9ff3c400fae24c70996c