Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Wed, 25 Feb 2015 07:56:00 +0000 (08:56 +0100)
committermasensio <masensio@solidgear.es>
Wed, 25 Feb 2015 07:56:00 +0000 (08:56 +0100)

Trivial merge