[MERGE] trunk
authorJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 11:29:21 +0000 (16:59 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 11:29:21 +0000 (16:59 +0530)
commit0ce1ddcf8a1be5f9583424e586a797a077e9aaac
treecc683f8397870e8c0d27ee62273795725190010d
parent38ff5e3f36f1a4007d5f64ede7aad109c80236a6
parent5e764699c3ac402b8be1e3ae7d075dac8f7c1e7d
[MERGE] trunk

bzr revid: jam@tinyerp.com-20120622062918-ps25b28c8bbvrau4
bzr revid: jam@tinyerp.com-20120626112921-ua2l59y6jqx7xyfk
addons/mail/mail_thread.py