Merge branch 'develop' into share_link__new_share
authormasensio <masensio@solidgear.es>
Wed, 5 Feb 2014 07:50:19 +0000 (08:50 +0100)
committermasensio <masensio@solidgear.es>
Wed, 5 Feb 2014 07:50:19 +0000 (08:50 +0100)

Trivial merge