From: masensio <masensio@solidgear.es>
Date: Thu, 30 Jan 2014 17:54:54 +0000 (+0100)
Subject: Merge branch 'share_link_show_shared_files' into share_link__new_share
X-Git-Tag: oc-android-1.5.5~58^2~21
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c550c8701bcb477e2d2a6af7c68e5154e5612102?hp=c550c8701bcb477e2d2a6af7c68e5154e5612102

Merge branch 'share_link_show_shared_files' into share_link__new_share
---