Merge branch 'develop' into share_link__unshare_file
authormasensio <masensio@solidgear.es>
Mon, 10 Feb 2014 12:48:02 +0000 (13:48 +0100)
committermasensio <masensio@solidgear.es>
Mon, 10 Feb 2014 12:48:02 +0000 (13:48 +0100)

Trivial merge