Xavier Morel bac9bbf263 [MERGE] from trunk ... bzr revid: xmo@openerp.com-20120515070556-l2ew6ixbup3u56md		2012-05-15 09:05:56 +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] from trunk	2012-05-15 09:05:56 +02:00