Antony Lesuisse 4f299e1b1b [MERGE] trunk ...

bzr revid: al@openerp.com-20121002220720-z0rjvmjx8kvy52zh

2012-10-03 00:07:20 +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] trunk

2012-10-03 00:07:20 +02:00