[MERGE]
authorStephane Wirtel <stw@openerp.com>
Mon, 3 Oct 2011 12:09:40 +0000 (14:09 +0200)
committerStephane Wirtel <stw@openerp.com>
Mon, 3 Oct 2011 12:09:40 +0000 (14:09 +0200)
commit012164a0abdada8a50d00c816ec37293a19b9c80
tree304a1eb117380162c36ced27b336d46f1a42ebae
parentb916762b26a8affc3de592936f335b013de2d48f
parent56c5b496baee8455e349695fa0361d33bdc2ccfe
[MERGE]

bzr revid: stw@openerp.com-20111003120940-e0i7cgvcxvnxxgf1
addons/account/__openerp__.py
addons/account/account_installer.xml
addons/account_followup/__openerp__.py
addons/base_setup/base_setup.py
addons/base_setup/base_setup_views.xml
addons/crm/crm_installer_view.xml
addons/hr/hr_installer.xml
addons/mrp/mrp_installer.xml
addons/project/project_installer.xml
addons/purchase/wizard/purchase_installer.py
addons/purchase/wizard/purchase_installer.xml