[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)
commit71560225a97bb66b3bbac43fb373861190e0d43d
tree7db8105fe1f9ed3fc078ae21928af46e5d6a4232
parent56038a3cf936e028c3a5ba47c3f9665de98e518c
parent301f4803e2916cf2b8caa53f1518787690cdcd9b
[MERGE] from trunk

bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
addons/product/product_view.xml