[MRG] merge with main branch

bzr revid: avo@tinyerp.com-20140414071801-3eaa6iqryfrolxbt

diff --cc addons/mail/data/mail_data.xml
index f324882,cdd7eb1..8e52f7e
--- 1/addons/mail/data/mail_data.xml
--- 2/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@@ -40,9 -40,20 +40,20 @@@
              <field name="args">()</field>
          </record>
  
+         <!-- After installation of the module, open the related menu -->
+         <record id="action_client_messaging_menu" model="ir.actions.client">
+             <field name="name">Open Messaging Menu</field>
+             <field name="tag">reload</field>
+             <field name="params" eval="{'menu_id': ref('mail.mail_feeds_main')}"/>
+         </record>
+         <record id="base.open_menu" model="ir.actions.todo">
+             <field name="action_id" ref="action_client_messaging_menu"/>
+             <field name="state">open</field>
+         </record>
+ 
          <!-- Admin should not receivve emails at creation -->
          <record id="base.partner_root" model="res.partner">
 -            <field name="notification_email_send">none</field>
 +            <field name="notify_email">none</field>
          </record>
  
          <!-- Catchall Email Alias -->

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

diff --cc addons/website_partner/website_partner_demo.xml
Simple merge