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

Merge branch 'share_link__new_share' into share_link__unshare_file
---