[MERGE] Merged with mail-state-tde, recently updated with trunk.
authorThibault Delavallée <tde@openerp.com>
Wed, 20 Jun 2012 07:42:29 +0000 (09:42 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 20 Jun 2012 07:42:29 +0000 (09:42 +0200)
commita0fa99ba48c7631fdd3f4f3c971de6567e6de0e4
tree7a6ef44740c5622f77acfe0d99d2ca496fcdf13f
parent657131a79006e75ad7fd63d7555c6468a2062a75
parent262d240ca807b89211c2f3913dce9aa61978a992
[MERGE] Merged with mail-state-tde, recently updated with trunk.

bzr revid: tde@openerp.com-20120620074229-bb2ahofjrggppcjf
addons/crm/crm_lead_view.xml
addons/mail/mail_message_view.xml