[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Tue, 20 Nov 2012 16:34:29 +0000 (17:34 +0100)
committerOlivier Dony <odo@openerp.com>
Tue, 20 Nov 2012 16:34:29 +0000 (17:34 +0100)
commitb770240247fe09a4424b03f2b74b3485333d3a22
treeb850922f3a8fd0da71a41682ad3115cb6fa667f2
parent340ec6d5c3f219e33a2ae198582033781036a0be
parent3edac3494914802810c785e0fd6ab67a4be9cf4c
[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121120113600-4oyx9sziigbxn8w8
bzr revid: odo@openerp.com-20121120163429-l4cf6r75vwqfvxty
addons/edi/controllers/main.py
addons/mail/tests/test_mail.py
addons/mail/tests/test_mail_access_rights.py
addons/mail/wizard/mail_compose_message.py