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)
commitb64fd4cc5b9d702f18cbc27ed650ba604d0757dd
treef604f775552a9d7c8f82a9f4e26d315174ace738
parentaa7b7af7212e68a52bd2234a9fa7801b6d3006c5
parent5169261b66eb47a3730c3836199c251a4d5d7286
Merge branch 'develop' into cancel_transfer_for_deleted_users