[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 21 Jun 2013 09:24:24 +0000 (11:24 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 21 Jun 2013 09:24:24 +0000 (11:24 +0200)
bzr revid: tde@openerp.com-20130621092424-supbxu8mwm2qtu6b

1  2 
addons/mail/mail_thread.py

Simple merge