[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130717074710-2jz58nqwe7hnyyij

diff --cc addons/mail/__openerp__.py
Simple merge

diff --cc addons/mail/mail_message.py
Simple merge

diff --cc addons/mail/static/src/css/mail.css
Simple merge

diff --cc addons/mail/static/src/js/mail.js
index 81a800b,5d54a6a..7339ee6
--- 1/addons/mail/static/src/js/mail.js
--- 2/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@@ -962,8 -967,24 +967,29 @@@ openerp.mail = function (session) 
              this.$('.oe_reply').on('click', this.on_message_reply);
              this.$('.oe_star').on('click', this.on_star);
              this.$('.oe_msg_vote').on('click', this.on_vote);
++<<<<<<< TREE
 +            this.$('.oe_mail_expand').on('click', this.on_expand);
 +            this.$('.oe_mail_reduce').on('click', this.on_expand);
++=======
+             this.$('.oe_mail_action_model').on('click', this.on_record_clicked);
+         },
+ 
+         on_record_clicked: function  (event) {
+             event.stopPropagation();
+             var state = {
+                 'model': this.model,
+                 'id': this.res_id,
+                 'title': this.record_name
+             };
+             session.webclient.action_manager.do_push_state(state);
+             this.do_action({
+                 res_model: state.model,
+                 res_id: state.id,
+                 type: 'ir.actions.act_window',
+                 views: [[false, 'form']]
+             });
+             return false;
++>>>>>>> MERGE-SOURCE
          },
  
          /* Call the on_compose_message on the thread of this message. */

diff --cc addons/mail/static/src/xml/mail.xml
Simple merge