[MERGE]Merged with 7.0
[odoo/odoo.git] / addons / .bzrignore
1 .*