[MERGE]merge with latest trunk
authorCedric Snauwaert <csn@openerp.com>
Mon, 10 Feb 2014 16:15:56 +0000 (17:15 +0100)
committerCedric Snauwaert <csn@openerp.com>
Mon, 10 Feb 2014 16:15:56 +0000 (17:15 +0100)
bzr revid: csn@openerp.com-20140210161556-qq52vvhdegyda7k6

1  2 
addons/event_sale/event_sale_view.xml
addons/sale/sale_view.xml

Simple merge
Simple merge