[MERGE] from trunk
authorRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 22 Apr 2014 09:30:02 +0000 (11:30 +0200)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 22 Apr 2014 09:30:02 +0000 (11:30 +0200)
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr

1  2 
addons/product/product_view.xml

Simple merge