[IMP] resolve conflicts
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Thu, 19 Apr 2012 06:53:06 +0000 (12:23 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Thu, 19 Apr 2012 06:53:06 +0000 (12:23 +0530)
commit6dbbf9e79d16f83d46087b50466c34827823e582
treeebc3a84de6ae2a612158e157a3361324238a9d1e
parent735c6d594634df5884d91a5cb756a4985de9c4ce
[IMP] resolve conflicts

bzr revid: psi@tinyerp.com-20120419065306-2ie570l1mpu9jegt
addons/mail/wizard/mail_compose_message.py