Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Mon, 16 Feb 2015 07:51:30 +0000 (08:51 +0100)
committermasensio <masensio@solidgear.es>
Mon, 16 Feb 2015 07:51:30 +0000 (08:51 +0100)

Trivial merge