Thibault Delavallée 48b08907c0 [MERGE] Merged with trunk web. ...

bzr revid: tde@openerp.com-20120627115748-3ckox2kez2uhfb7k

2012-06-27 13:57:48 +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] Merged with trunk web.

2012-06-27 13:57:48 +02:00