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)
commit2a02a08d52656ce3259939e2448800388675a0c5
tree582b0047847571d72a034adf5cbbbda1f0d540d0
parent3ff42b62208fa582cf9605e452099392ceeb2b43
parent754c277fddcb657644b12c07f00d6a70e234ae0d
Merge branch 'develop' into cancel_transfer_for_deleted_users