[MERGE] forward port of branch 7.0 up to revid 5270 chs@openerp.com-20140403084524...
[odoo/odoo.git] / LICENSE
2010-12-08 Olivier Dony[IMP] license: renamed general license file, and includ...