[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Tue, 4 Jun 2013 13:44:14 +0000 (15:44 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 4 Jun 2013 13:44:14 +0000 (15:44 +0200)
bzr revid: tde@openerp.com-20130604134414-ryv37jryzi3c8061

1  2 
addons/sale_crm/sale_crm_view.xml

Simple merge