[MERGE] Merged with server/trunk.
[odoo/odoo.git] / addons / web / controllers / __init__.py
1 from . import main