[MERGE] forward port of branch 7.0 up to ae99a93
[odoo/odoo.git] / LICENSE
2010-12-08 Olivier Dony[IMP] license: renamed general license file, and includ...