Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Fri, 5 Jun 2015 08:32:37 +0000 (10:32 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Fri, 5 Jun 2015 08:32:37 +0000 (10:32 +0200)
commit23af1d2310d80891d77db01a1f7df90f242702f9
treec34b44bb4643c846fa0d7483974c05ecd94b3bf4
parentf6870c58830af3b22617968f7647a91b6a9962bc
parente93502657ce3c62ed03554df3234424f7c2a3be7
Merge branch 'develop' into automationTest