Merge remote-tracking branch 'odoo/7.0' into 7.0
[odoo/odoo.git] / openerp / .apidoc
2011-06-23 P. ChristeasAPI doc: move settings file from bin/ to openerp/