Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Thu, 26 Jul 2012 02:20:23 +0000 (11:20 +0900)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Thu, 26 Jul 2012 02:20:23 +0000 (11:20 +0900)
commit0c4db51f3b798051c27b11765e22eb30ce227eb9
treef0e6ac471b6f4c82cb2c54609110479edd81be2a
parentf6bcf05cf3390da9591b544dd65466f3e936ad33
parent27a5abf6dc362f9571cb03d731d9ebaae7ef3a2c
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
TODO
tunnel.py
TODO
registry.py
tunnel.py
vifibnet.py