Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Tue, 24 Jul 2012 09:25:07 +0000 (18:25 +0900)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Tue, 24 Jul 2012 09:25:07 +0000 (18:25 +0900)
commit0820ffd13e06e955c3b102ddffa4174bb8c9f331
tree66cbad6132f67a58852d32638992dd932d8b2311
parent6b0076d29d77d3f9bbd6aa17f237a0d2dac981c1
parent23f47592cb4cfe5667c6bac8d7f5de39cb220aea
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
TODO
TODO