Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Tue, 17 Jul 2012 09:54:11 +0000 (18:54 +0900)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Tue, 17 Jul 2012 09:54:11 +0000 (18:54 +0900)
commitfffa50111160a45b14bbfca85fa6ddd3b44609cb
treed94bcec11ee30508e95218699d8b40375e9f35c0
parent6a6653800e1c92e948019df807f2ea6254759470
parent96b58da8df69a89637de79f4a5476718b64b11ff
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
tunnelmanager.py
TODO
tunnelmanager.py
vifibnet.py