[MERGE] merged with trunk
[odoo/odoo.git] / addons / web_rpc / __init__.py