Gery Debongnie c8e23ffe28 [MERGE] merge from trunk into local branch ... bzr revid: ged@openerp.com-20140211082642-ndnt79zjgjlcyr6a		2014-02-11 09:26:42 +01:00
..
lib	[MERGE] forward port of branch 7.0 up to revid 4162 launchpad_translations_on_behalf_of_openerp-20140318062141-rdiqz2ptnz3qmxd0	2014-03-18 12:27:43 +01:00
src	[MERGE] merge from trunk into local branch	2014-02-11 09:26:42 +01:00
test	[FIX] enable jsonrpc-auth tests, remove stray log	2014-01-31 16:41:47 +01:00