[MERGE] forward port of branch saas-2 up to revid 3887 chs@openerp.com-20131122172422...
[odoo/odoo.git] / addons / .bzrignore
1 .*
2 **/node_modules