Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Wed, 25 Feb 2015 07:56:00 +0000 (08:56 +0100)
committermasensio <masensio@solidgear.es>
Wed, 25 Feb 2015 07:56:00 +0000 (08:56 +0100)
commit2abceb0ed5abefefc3655fb27d234b81de3873ab
tree2f597d3814cc12b148d730cd56fae1b5de3a06d3
parent8d773ef002b8453a11318353733794ca6800795c
parent72bd1c17a585df6fdf60bc69afbbd310d5850c63
Merge branch 'develop' into cancel_transfer_for_deleted_users