[MERGE] merge with main trunk-payroll branch
[odoo/odoo.git] / addons / base_tools / __init__.py