Fabien Meghazi 9d1986936d [MERGE] Merge trunk ... bzr revid: fme@openerp.com-20120329085505-992ia13mhermy73v		2012-03-29 10:55:05 +02:00
..
common	[REL] OpenERP 6.1.1	2012-02-22 12:43:22 +01:00
controllers	[rollback 2367] due to blocking bug during login	2012-03-26 12:44:30 +02:00
i18n	Launchpad automatic translations update.	2012-03-29 04:46:39 +00:00
static	[MERGE] Merge trunk	2012-03-29 10:55:05 +02: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