[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Fri, 28 Jun 2013 12:54:28 +0000 (14:54 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 28 Jun 2013 12:54:28 +0000 (14:54 +0200)
commitdeadcd311ab02e8100c3381a06bb4c41a1a439fe
tree31889a24eed6a212defc161ff57da595fb5a83b6
parent3d53ee51388fdf9d6beb7060f3efa4b29b1d5a06
parent35cf403b10646a988fbc16c515c496b456c6cd02
[MERGE] from upstream

bzr revid: fva@openerp.com-20130628125403-ydu0h7g065rgg73o
bzr revid: fva@openerp.com-20130628125428-73kvuumfb35ylq5l
addons/stock/static/src/js/widgets.js