[MERGE]with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb
authorDarshan Kalola (OpenERP) <dka@tinyerp.com>
Fri, 8 Nov 2013 13:40:52 +0000 (19:10 +0530)
committerDarshan Kalola (OpenERP) <dka@tinyerp.com>
Fri, 8 Nov 2013 13:40:52 +0000 (19:10 +0530)
bzr revid: dka@tinyerp.com-20131108134052-49pappgab0d7j49q

1  2 
addons/product/product_view.xml

Simple merge