Xavier Morel e178185b4f [MERGE] bug fixes form 6.1 branch ...

bzr revid: xmo@openerp.com-20120305070634-li0eloj7vhsljguu

2012-03-05 08:06:34 +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] bug fixes form 6.1 branch

2012-03-05 08:06:34 +01:00