niv-openerp ce77d86da4 merge trunk ... bzr revid: nicolas.vanhoren@openerp.com-20120525131037-n077w3nh3mu70y62 bzr revid: nicolas.vanhoren@openerp.com-20120525142624-rdkx40r0w1cahdto		2012-05-25 16:26:24 +02:00
..
common	[MERGE] from trunk	2012-04-19 10:12:13 +02:00
controllers	[MERGE] from trunk	2012-05-15 09:05:56 +02:00
i18n	Launchpad automatic translations update.	2012-05-16 05:10:16 +00:00
static	merge trunk	2012-05-25 16:26:24 +02:00
test	[FIX] dependencies handling in modules listing of web client	2012-03-06 15:20:10 +01:00
test_support	[ADD] nonliterals in dataset tests	2012-02-27 09:51:28 +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-05-15 09:05:56 +02:00