Merge remote-tracking branch 'origin/develop' into share_link__unshare_file
authormasensio <masensio@solidgear.es>
Fri, 7 Feb 2014 07:51:48 +0000 (08:51 +0100)
committermasensio <masensio@solidgear.es>
Fri, 7 Feb 2014 07:51:48 +0000 (08:51 +0100)

Trivial merge