Merge remote-tracking branch 'origin/develop' into share_link__new_share
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Jan 2014 12:24:40 +0000 (13:24 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 22 Jan 2014 12:24:40 +0000 (13:24 +0100)

Trivial merge