Merge branch 'share_link_show_shared_files' into share_link__new_share
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Jan 2014 12:25:22 +0000 (13:25 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Jan 2014 12:25:22 +0000 (13:25 +0100)

Trivial merge