[MERGE]: Merged with lp:openobject-addons
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Fri, 14 Sep 2012 04:47:22 +0000 (10:17 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Fri, 14 Sep 2012 04:47:22 +0000 (10:17 +0530)
commit9883a6c825c246ee49f184bd8ce02ae112d83c66
tree42dfb66d199bdbaa91ee8f88e5848b5eab89ed95
parentf09dca2042ad82ac772646ecfb89f258a8ff4012
parent9df7381ced04b44e470fe0a060b6b82773f20c84
[MERGE]: Merged with lp:openobject-addons

bzr revid: atp@tinyerp.com-20120912174620-3kjdtcy77wihgeg7
bzr revid: atp@tinyerp.com-20120914044722-xu7x32rzapnl50tp
addons/mail/mail_message.py
addons/mail/mail_thread.py
addons/mail/static/src/css/mail.css
addons/mail/static/src/js/mail.js
addons/mail/static/src/xml/mail.xml