[MERGE] forward port of branch 7.0 up to 15ee4d8
authorChristophe Simonis <chs@odoo.com>
Thu, 28 Aug 2014 17:07:11 +0000 (19:07 +0200)
committerChristophe Simonis <chs@odoo.com>
Thu, 28 Aug 2014 17:07:11 +0000 (19:07 +0200)
commitc914893f6f8f8453170366e35d08b7443fcaf80c
tree94d6a80cd191b5b409ff5af590aaa97842c2741b
parent1d9bdb43bf2adc7b6b55b616d65f0a5db44b67dc
parent15ee4d83c937ed8df3c25a46894280a36b48f468
[MERGE] forward port of branch 7.0 up to 15ee4d8
addons/email_template/wizard/mail_compose_message.py