Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Wed, 18 Feb 2015 11:26:49 +0000 (12:26 +0100)
committermasensio <masensio@solidgear.es>
Wed, 18 Feb 2015 11:26:49 +0000 (12:26 +0100)

Trivial merge