From: masensio <masensio@solidgear.es>
Date: Thu, 6 Feb 2014 10:23:30 +0000 (+0100)
Subject: Merge branch 'share_link__new_share' into share_link__unshare_file
X-Git-Tag: oc-android-1.5.5~35^2~22
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1bdf1e60f1c18762d0a77543f74a2c28fb859557?ds=inline;hp=1bdf1e60f1c18762d0a77543f74a2c28fb859557

Merge branch 'share_link__new_share' into share_link__unshare_file
---