[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Tue, 14 Aug 2012 10:02:17 +0000 (12:02 +0200)
committerOlivier Dony <odo@openerp.com>
Tue, 14 Aug 2012 10:02:17 +0000 (12:02 +0200)
bzr revid: odo@openerp.com-20120814100217-33qe1dyc3w6vfs0g

1  2 
addons/mail/mail_thread.py

Simple merge