Vidhin Mehta (OpenERP) 235cca3aab [MERGE]merge with trunk and remove conflicts. ...

bzr revid: vme@tinyerp.com-20120620144304-yr9zodv1skkrlccf

2012-06-20 20:13:04 +05:30

..

__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]merge with trunk and remove conflicts.

2012-06-20 20:13:04 +05:30