From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 7 Feb 2014 08:23:40 +0000 (+0100)
Subject: Merge branch 'share_link__new_share' into release-1.5.4
X-Git-Tag: oc-android-1.5.5~35^2~16
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/cba8baa98d3b2a15ca8f7fce8302bd64e83c6976?ds=inline;hp=--cc

Merge branch 'share_link__new_share' into release-1.5.4
---

cba8baa98d3b2a15ca8f7fce8302bd64e83c6976