Fabien Meghazi 8cd8c2b83a [MERGE] trunk ...

bzr revid: fme@openerp.com-20120816112021-dkpubr6q762qwq11

2012-08-16 13:20:21 +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] trunk

2012-08-16 13:20:21 +02:00