Quentin (OpenERP) 83486cd725 [MERGE] manual merge of the branch from noviat lp:~noviat/openobject-addons/trunk-account_coda. The bzr merge commande was going crazy because of an initial wrong merge between this branch and the trunk, an extra .bzr folder and because of wrongly removed translations files... ... bzr revid: qdp-launchpad@openerp.com-20111223103637-ltq8x53f4tjbmd8b		2011-12-23 11:36:37 +01:00
..
ir.model.access.csv	[MERGE] manual merge of the branch from noviat lp:~noviat/openobject-addons/trunk-account_coda. The bzr merge commande was going crazy because of an initial wrong merge between this branch and the trunk, an extra .bzr folder and because of wrongly removed translations files...	2011-12-23 11:36:37 +01:00