[MERGE] forward port of branch 7.0 up to de07c64
[odoo/odoo.git] / addons / web_api / __init__.py