Xavier Morel 54a8f9e193 [MERGE] 6.1 changes and trunk ...

bzr revid: xmo@openerp.com-20120625135215-az1927llmk0vw655

2012-06-25 15:52:15 +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] 6.1 changes and trunk

2012-06-25 15:52:15 +02:00