From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 6 Feb 2014 12:58:41 +0000 (+0100)
Subject: Merge branch 'share_link__new_share' into setup_additions
X-Git-Tag: oc-android-1.5.5~58^2~1^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4db5295f560dc2cc5deefcbd2b6c397738003f6b?hp=4db5295f560dc2cc5deefcbd2b6c397738003f6b

Merge branch 'share_link__new_share' into setup_additions
---