From: masensio <masensio@solidgear.es>
Date: Wed, 29 Jan 2014 10:14:19 +0000 (+0100)
Subject: Merge branch 'share_link_show_shared_files' into share_link__code_improvements
X-Git-Tag: oc-android-1.5.5~35^2~43^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7c0accf714ec85a08c70747cf8d84dbada817a67?hp=7c0accf714ec85a08c70747cf8d84dbada817a67

Merge branch 'share_link_show_shared_files' into share_link__code_improvements
---