Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorGuillaume Bury <guillaume.bury@tiolive.com>
Tue, 17 Jul 2012 11:04:20 +0000 (13:04 +0200)
committerGuillaume Bury <guillaume.bury@tiolive.com>
Tue, 17 Jul 2012 11:04:20 +0000 (13:04 +0200)
commit5cd60b3500c8ae63719adc4e07e30ba4f92a3bc4
treee50c48df1dc0ab53fff3c75489e78c5cb302b52b
parent8c83df36db88059164ff292f992c538efe94de39
parentfffa50111160a45b14bbfca85fa6ddd3b44609cb
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

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