[MERGE] merged with main trunk
[odoo/odoo.git] / addons / .bzrignore
1 .*