Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Wed, 4 Jul 2012 10:10:14 +0000 (19:10 +0900)
committerUlysse Beaugnon <ulysse.beaugnon@tiolive.com>
Wed, 4 Jul 2012 10:10:14 +0000 (19:10 +0900)
commitf9beed0ce7b3131f99b8a5aea1e769aae3252519
tree54448523f026debf48c4bd885182f550f3ddf9e0
parentbc5d0fc1ac14a0ad4ca194ee46e622a4549ad9d6
parent8cba4e1961fd279c73b2534656086cc6fcc8f5cd
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
main.py
main.py