Merge remote-tracking branch 'origin/cancel_transfer_for_deleted_users' into cancel_t...
authormasensio <masensio@solidgear.es>
Tue, 24 Feb 2015 14:09:54 +0000 (15:09 +0100)
committermasensio <masensio@solidgear.es>
Tue, 24 Feb 2015 14:09:54 +0000 (15:09 +0100)

Trivial merge