Merge branch 'share_link_show_shared_files' into share_link__unshare_file
authormasensio <masensio@solidgear.es>
Tue, 4 Feb 2014 12:31:30 +0000 (13:31 +0100)
committermasensio <masensio@solidgear.es>
Tue, 4 Feb 2014 12:31:30 +0000 (13:31 +0100)

Trivial merge