[MERGE] trunk
[odoo/odoo.git] / debian / openerp-server.docs
1 doc/migrate
2 doc/tests