[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)
commit34171507bb35f00bf3fc3f51c2e7d281f3afa6e9
tree77b342c323ce50e8e53acadf3d0902b8d3527597
parenta5f4747b198dbc09ed1ab4027ed0ea6990f205a5
parent3bef5925a4dd1d15a553b281221591ca10d32ac5
[MERGE] from upstream

bzr revid: fva@openerp.com-20130628163349-4erq76zp1ddkuufj
addons/stock/static/src/js/widgets.js