Merge remote-tracking branch 'odoo/7.0' into 7.0
[odoo/odoo.git] / LICENSE
2010-12-08 Olivier Dony[IMP] license: renamed general license file, and includ...