[MERGE] Sync with 7.0
authorThibault Delavallée <tde@openerp.com>
Fri, 4 Jan 2013 16:02:27 +0000 (17:02 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 4 Jan 2013 16:02:27 +0000 (17:02 +0100)
bzr revid: tde@openerp.com-20130104160227-42e2vjrqf443muy4

1  2 
addons/mail/mail_thread.py

Simple merge