[MERGE] latest trunk
[odoo/odoo.git] / addons / .bzrignore
1 .*