Merge branch 'share_link__unshare_file' into release-1.5.4
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 18 Feb 2014 10:16:22 +0000 (11:16 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 18 Feb 2014 10:16:22 +0000 (11:16 +0100)

Trivial merge