[MERGE] merged with trunk addons
[odoo/odoo.git] / addons / website / __init__.py
1 import controllers
2 import models
3 import tests