Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Tue, 3 Feb 2015 10:25:09 +0000 (11:25 +0100)
committermasensio <masensio@solidgear.es>
Tue, 3 Feb 2015 10:25:09 +0000 (11:25 +0100)

Trivial merge