Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Mon, 16 Feb 2015 07:51:30 +0000 (08:51 +0100)
committermasensio <masensio@solidgear.es>
Mon, 16 Feb 2015 07:51:30 +0000 (08:51 +0100)
commit3bed5fea7aed571f8b5eaf47254464ba5a639f32
tree4fb48075be77c37136902ab1d68298d8fdd549b1
parent2a02a08d52656ce3259939e2448800388675a0c5
parenteffee70675ad9b8dfc6112586ac078da58906c9b
Merge branch 'develop' into cancel_transfer_for_deleted_users