[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Thu, 6 Jun 2013 13:53:13 +0000 (15:53 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 6 Jun 2013 13:53:13 +0000 (15:53 +0200)
commit5601fbd78c04c63e3d298328b285d992634ad4f7
tree529557e50f776ff8d91d311699fa7d1babd3ba78
parent89896f32bbf6aeecfbddc0f7e8397781fce2a99c
parentd5d2f88b010315913bfde469e905fc100e7d1b76
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130606135313-u3mbe1a8yeussnck
addons/hr/hr.py
addons/mail/mail_message.py
addons/mail/mail_thread.py
addons/mail/mail_thread_view.xml
addons/mail/res_users_view.xml
addons/mail/static/src/css/mail.css
addons/mail/static/src/js/mail.js
addons/mail/static/src/xml/mail.xml
addons/portal/mail_mail.py