Merge branch 'develop' into share_link__unshare_file
authormasensio <masensio@solidgear.es>
Tue, 11 Feb 2014 09:56:31 +0000 (10:56 +0100)
committermasensio <masensio@solidgear.es>
Tue, 11 Feb 2014 09:56:31 +0000 (10:56 +0100)

Trivial merge