Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorGuillaume Bury <guillaume.bury@tiolive.com>
Fri, 20 Jul 2012 12:59:17 +0000 (14:59 +0200)
committerGuillaume Bury <guillaume.bury@tiolive.com>
Fri, 20 Jul 2012 12:59:17 +0000 (14:59 +0200)
commit6a4315f8579f36e6d0e599db88b20e704773b760
treeccbfc66fa28e75322ac709d1258e1788fc33a73b
parentd0f470753bc867bf9a256a6c3e54b62ab83cf226
parent767e6793b1637f9e9121a3400a907ebbaaaf9c01
Merge branch 'master' of https://git.erp5.org/repos/vifibnet