Olivier Dony 9e6920415e [MERGE] Sync with trunk ...

bzr revid: odo@openerp.com-20121001145308-ri5rp2cazxqxcxme

2012-10-01 16:53:08 +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] Sync with trunk

2012-10-01 16:53:08 +02:00