[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Fri, 28 Jun 2013 14:43:15 +0000 (16:43 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 28 Jun 2013 14:43:15 +0000 (16:43 +0200)
bzr revid: fva@openerp.com-20130628144300-abhgsg7w7qrn1vli
bzr revid: fva@openerp.com-20130628144315-kivd21cvsp57rlp3

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

Simple merge