Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Fri, 13 Feb 2015 14:16:58 +0000 (15:16 +0100)
committermasensio <masensio@solidgear.es>
Fri, 13 Feb 2015 14:16:58 +0000 (15:16 +0100)

Trivial merge