[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)
commit459da1fb46e327e675d536822ac1181b59100357
treefe4ea771ac1ab81adc29749d73aac4ac75f5ea44
parentee08ed5a57ce978f14054e7eb6b0b714f28e49f4
parentd4716db1cca850d5c2ec28c2315aa2031ddc0025
[MERGE] Sync with 7.0

bzr revid: tde@openerp.com-20130104160227-42e2vjrqf443muy4
addons/mail/mail_thread.py