[MERGE] merge from trunk addons
[odoo/odoo.git] / addons / marketing_campaign_crm_demo / __init__.py