[MERGE] with addons-trunk and resolve conflict in base_iban
[odoo/odoo.git] / LICENSE
2010-12-08 Olivier Dony[IMP] license: renamed general license file, and includ...