Merge branch 'master' of https://git.erp5.org/repos/vifibnet
authorGuillaume Bury <guillaume.bury@tiolive.com>
Wed, 4 Jul 2012 11:12:04 +0000 (13:12 +0200)
committerGuillaume Bury <guillaume.bury@tiolive.com>
Wed, 4 Jul 2012 11:12:04 +0000 (13:12 +0200)
commit18dee84527c114568281458e73bed589eab5c683
treebc97762e7d8ca52e4dbe282b797af7331c454069
parentec7c78d6fd79f1333eb8e4241cb4e67bf190a78b
parentf9beed0ce7b3131f99b8a5aea1e769aae3252519
Merge branch 'master' of https://git.erp5.org/repos/vifibnet

Conflicts:
main.py
main.py