Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Mon, 23 Jul 2012 09:55:06 +0000 (18:55 +0900)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Mon, 23 Jul 2012 09:55:06 +0000 (18:55 +0900)
commit3368dc9bfa2949d2a7b138a64a6b90b7fcfcbe64
treeac2094dd5131c9071231d47590fe87393b7fcc97
parent224f7b2874e91d34ba8ab692e29d1812cbed747e
parent03e3061aa7830a8d23ff85d709f7853c067feac2
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
TODO
plib.py
TODO
plib.py
vifibnet.py