Olivier Dony aa98dd38e2 [MERGE] Sync with trunk ...

bzr revid: odo@openerp.com-20120911114201-1omaloa3b2dld9l9

2012-09-11 13:42:01 +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-09-11 13:42:01 +02:00