[MERGE] Sync with 7.0
authorThibault Delavallée <tde@openerp.com>
Fri, 4 Jan 2013 10:56:57 +0000 (11:56 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 4 Jan 2013 10:56:57 +0000 (11:56 +0100)
bzr revid: tde@openerp.com-20130104105657-s8hif4p63oem8ddz

1  2 
addons/mail/mail_thread.py
addons/mail/wizard/invite.py

Simple merge
Simple merge