[MERGE] merged with trunk-development-branch
[odoo/odoo.git] / addons / .bzrignore
1 .*