[MERGE] trunk
authorFabien Pinckaers <fp@openerp.com>
Wed, 15 Aug 2012 18:57:13 +0000 (20:57 +0200)
committerFabien Pinckaers <fp@openerp.com>
Wed, 15 Aug 2012 18:57:13 +0000 (20:57 +0200)
commitd820e866ee2ce0a69a268c0302cbbeb45e5b0f50
treec3e88ba65e7990d5306c87c49c23431100bb4310
parenta4f9b6ca0971aa5aca6fa30342e6acb950f42c3b
parent50275e9ec945ba6865a09e9cd708793018bed0dd
[MERGE] trunk

bzr revid: fp@openerp.com-20120815185713-82zylb0yqqgs008y
addons/mail/__init__.py
addons/mail/mail_message.py
addons/mail/mail_thread.py
addons/mail/res_partner.py
addons/mail/res_users.py
addons/mail/wizard/mail_compose_message.py
addons/purchase/purchase.py
addons/purchase/purchase_view.xml
addons/sale/sale.py