[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Fri, 28 Jun 2013 16:33:49 +0000 (18:33 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 28 Jun 2013 16:33:49 +0000 (18:33 +0200)
bzr revid: fva@openerp.com-20130628163349-4erq76zp1ddkuufj

1  2 
addons/stock/static/src/js/widgets.js

Simple merge