Xavier Morel 1b0c140834 [MERGE] from trunk ... bzr revid: xmo@openerp.com-20120329110300-z4l730o4y4swmadx		2012-03-29 13:03:00 +02:00
..
common	[FIX] custom contexts and domains in search view fields	2012-03-23 10:39:13 +01:00
controllers	[MERGE] 6.1 fixes into trunk	2012-03-22 12:31:42 +01:00
i18n	Launchpad automatic translations update.	2012-03-29 04:46:39 +00:00
static	[MERGE] from trunk	2012-03-29 13:03:00 +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] from trunk	2012-03-29 13:03:00 +02:00