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