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