Thibault Delavallée 8cefe9a5e1 [MERGE] Merged with main web ...

bzr revid: tde@openerp.com-20120402072422-tsjaxjbfrngqnodp
bzr revid: tde@openerp.com-20120403071448-x3ng76yc17pcy266

2012-04-03 09:14: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 main web

2012-04-03 09:14:48 +02:00