Merge branch 'develop' into share_link_show_shared_files
authormasensio <masensio@solidgear.es>
Thu, 16 Jan 2014 17:46:07 +0000 (18:46 +0100)
committermasensio <masensio@solidgear.es>
Thu, 16 Jan 2014 17:46:07 +0000 (18:46 +0100)

Trivial merge