[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 10:32:47 +0000 (12:32 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 10:32:47 +0000 (12:32 +0200)
commit4cb99779ba9a502bc0d8ffca32289d371d6e8733
tree395dc6b20bbca425337d0780833245a738e86220
parentf397e44b2f2c23cb4ffb696c82e97f4a16f9b2f7
parent54cce9916effd7464233ed8d5646e2dbb3aef574
[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120814103247-ft1lda03ud0rv62q
addons/mail/mail_thread.py