Xavier Morel e7ab44929f [MERGE] from trunk ...

bzr revid: xmo@openerp.com-20120419081213-m3fhofkgydj6gp1m

2012-04-19 10:12:13 +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] from trunk

2012-04-19 10:12:13 +02:00