Merge branch 'develop' into share_link_show_shared_files
authormasensio <masensio@solidgear.es>
Mon, 20 Jan 2014 10:36:10 +0000 (11:36 +0100)
committermasensio <masensio@solidgear.es>
Mon, 20 Jan 2014 10:36:10 +0000 (11:36 +0100)

Trivial merge