From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 18 Feb 2014 10:16:22 +0000 (+0100)
Subject: Merge branch 'share_link__unshare_file' into release-1.5.4
X-Git-Tag: oc-android-1.5.5~35^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0f99af779e39e3bdca3ca67b5a196d69d36691fe?hp=--cc

Merge branch 'share_link__unshare_file' into release-1.5.4
---

0f99af779e39e3bdca3ca67b5a196d69d36691fe