Xavier Morel 1da49a44a5 [MERGE] 6.1 fixes into trunk ... bzr revid: xmo@openerp.com-20120322113142-gim4svx01p336nxm		2012-03-22 12:31:42 +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] 6.1 fixes into trunk	2012-03-22 12:31:42 +01:00