Vo Minh Thu 1ba3ae959f [MERGE] merged trunk. ...

bzr revid: vmt@openerp.com-20121114113528-t6ed04bv1d5p7h31

2012-11-14 12:35:28 +01: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 trunk.

2012-11-14 12:35:28 +01:00