Christophe Simonis ee01a39a76 merge upstream ...

bzr revid: chs@openerp.com-20120809152939-3dummyonbx1qdsbo

2012-08-09 17:29:39 +02:00

..

__init__.py

[FIX] imports to handle conflicts with e.g. web.py in embedded mode

2012-02-10 11:34:26 +01:00

main.py

merge upstream

2012-08-09 17:29:39 +02:00