Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorGuillaume Bury <guillaume.bury@tiolive.com>
Tue, 17 Jul 2012 09:09:31 +0000 (11:09 +0200)
committerGuillaume Bury <guillaume.bury@tiolive.com>
Tue, 17 Jul 2012 09:09:31 +0000 (11:09 +0200)
commitdbb032a721b360d81d4361c3fde4cf8086411c45
tree02b6576a84857a9a45b161363fba36ec99b48e08
parent6492c03e3accbf47580e2edf1c75e8c87c0ca8df
parentd19b9e2b2e5ad70bfaa710763ffe323a7ca812f6
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
TODO
TODO