Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorGuillaume Bury <guillaume.bury@tiolive.com>
Mon, 23 Jul 2012 10:15:40 +0000 (12:15 +0200)
committerGuillaume Bury <guillaume.bury@tiolive.com>
Mon, 23 Jul 2012 10:15:40 +0000 (12:15 +0200)
commit50003a3dcb493b127f565c8bdcda9516804fff81
tree309bb1c9f49006b8169175f8aade308678e89c9d
parent356e1468dd11e230fcfe9cfa1d44ec6e27f273e1
parent3368dc9bfa2949d2a7b138a64a6b90b7fcfcbe64
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
vifibnet.py
README
vifibnet.py