From: David A. Velasco Date: Wed, 22 Jan 2014 12:24:40 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/develop' into share_link__new_share X-Git-Tag: oc-android-1.5.5~35^2~43^2~10 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b8898a8864caf6edf40f11751789f9786b00081c Merge remote-tracking branch 'origin/develop' into share_link__new_share --- b8898a8864caf6edf40f11751789f9786b00081c