Merge branch 'develop' into share_link__reuse_link_shared_in_server
authormasensio <masensio@solidgear.es>
Tue, 18 Mar 2014 11:52:24 +0000 (12:52 +0100)
committermasensio <masensio@solidgear.es>
Tue, 18 Mar 2014 11:52:24 +0000 (12:52 +0100)

Trivial merge