[MERGE] fix bug 712370
[odoo/odoo.git] / addons / .bzrignore
1 .*