[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Mon, 2 Jul 2012 15:55:05 +0000 (17:55 +0200)
committerThibault Delavallée <tde@openerp.com>
Mon, 2 Jul 2012 15:55:05 +0000 (17:55 +0200)
bzr revid: tde@openerp.com-20120702155505-xnyy7oy97obmwcu2

1  2 
addons/mail/mail_thread.py
addons/mail/static/src/js/mail.js
addons/purchase/purchase_view.xml

Simple merge
Simple merge
Simple merge