Xavier Morel 1da49a44a5 [MERGE] 6.1 fixes into trunk ... bzr revid: xmo@openerp.com-20120322113142-gim4svx01p336nxm		2012-03-22 12:31:42 +01:00
..
common	[REL] OpenERP 6.1.1	2012-02-22 12:43:22 +01:00
controllers	[MERGE] 6.1 fixes into trunk	2012-03-22 12:31:42 +01:00
i18n	Launchpad automatic translations update.	2012-03-26 05:34:12 +00:00
static	[MERGE] 6.1 fixes into trunk	2012-03-22 12:31:42 +01:00
test	[FIX] dependencies handling in modules listing of web client	2012-03-06 15:20:10 +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
__openerp__.py	[MERGE] 6.1 fixes into trunk	2012-03-22 12:31:42 +01:00