[MERGE] merge with dev-addons3 branch
[odoo/odoo.git] / addons / .bzrignore
1 .*