[MERGE] merge from trunk addons
[odoo/odoo.git] / addons / email_template / html2text.py
2010-12-30 husenmerged with trunk
2010-08-18 Olivier Dony[IMP] email_template: review + many improvements:
2010-06-11 Fabien Pinckaers[IMP] marketing campaign
2010-06-02 DSH (Open ERP)[NEW] email_template (extracted from poweremail) just...