[MERGE] from trunk
[odoo/odoo.git] / addons / website_sale / __init__.py
1 import controllers
2 import models