[MERGE] forward port of branch saas-4 up to 5087612
[odoo/odoo.git] / LICENSE
2014-05-15 Antony Lesuissecleanup repo root
2010-12-08 Olivier Dony[IMP] license: renamed general license file, and includ...