Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Tue, 17 Jul 2012 09:03:34 +0000 (18:03 +0900)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Tue, 17 Jul 2012 09:03:34 +0000 (18:03 +0900)
commitd19b9e2b2e5ad70bfaa710763ffe323a7ca812f6
tree8818d35f20d1dae058928d97a52862062e7af4bb
parente25ef3f06acde0f44a83ef22e85b36278e713501
parente3464a003c9d0ce749bc26757d90d36810569334
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
vifibnet.py
vifibnet.py