Merge remote-tracking branch 'origin/develop' into share_link_show_shared_files
authormasensio <masensio@solidgear.es>
Wed, 29 Jan 2014 10:06:48 +0000 (11:06 +0100)
committermasensio <masensio@solidgear.es>
Wed, 29 Jan 2014 10:06:48 +0000 (11:06 +0100)

Trivial merge