Merge branch 'develop' into cancel_transfer_for_deleted_users
authormasensio <masensio@solidgear.es>
Wed, 18 Feb 2015 11:26:49 +0000 (12:26 +0100)
committermasensio <masensio@solidgear.es>
Wed, 18 Feb 2015 11:26:49 +0000 (12:26 +0100)
commit4984d909f21ca2eb45d730b280249578cb766a06
treeb8c0055ea84cd996a1c9694ab1d3105b6c19cb44
parentacb2da8f02ead5c17a4b6b36466efda91a7b42e9
parentae1bd1b6a158ea61230fea8822fd42eab358f467
Merge branch 'develop' into cancel_transfer_for_deleted_users