Antony Lesuisse eac3ebb87e [MERGE] trunk ...

bzr revid: nicolas.vanhoren@openerp.com-20120406123856-vpw1mk9rq642ur6n
bzr revid: al@openerp.com-20120406140537-z5em6fgqv8cnyj1t

2012-04-06 16:05:37 +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-04-06 16:05:37 +02:00