[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Mon, 14 May 2012 13:07:34 +0000 (15:07 +0200)
committerAntony Lesuisse <al@openerp.com>
Mon, 14 May 2012 13:07:34 +0000 (15:07 +0200)
commit542a7ab9ae021fb257bb9a45d8aa44b883e7dd22
tree6ef8bf7d008f9ca28f3defa577ba4791ac141123
parent25a48e9fbe5daf14dddc12efb0c108db7ddc3471
parent5e066510485e1c55db909560fcaf99b7840bafe1
[MERGE] trunk

bzr revid: al@openerp.com-20120514130734-088uai3tznhri9q3
openerp/addons/base/ir/ir.xml
openerp/addons/base/res/res_company_view.xml