[MERGE] from trunk-bug-1075501-vta
authorChristophe Matthieu <chm@openerp.com>
Thu, 6 Dec 2012 12:43:28 +0000 (13:43 +0100)
committerChristophe Matthieu <chm@openerp.com>
Thu, 6 Dec 2012 12:43:28 +0000 (13:43 +0100)
commit671a1d72f18ebcd6fa046f7f2ff67c2a06487919
treef64dcfb0ae44c1bbd572a6bbaf72b4652c602d3f
parent6efcefb69bbf5185e554e649ca78b1260a815553
parente3c7ae7e1d5ab2cde213300f7f5550d9826abdf0
[MERGE] from trunk-bug-1075501-vta

bzr revid: chm@openerp.com-20121206124328-o063xc0w2tavbmik
addons/mail/mail_message.py
addons/mail/wizard/invite.py