Merge pull request #598 from odoo-dev/master-wmsstaging3-jco
authorqdp-odoo <qdp@openerp.com>
Fri, 20 Jun 2014 14:55:29 +0000 (16:55 +0200)
committerqdp-odoo <qdp@openerp.com>
Fri, 20 Jun 2014 14:55:29 +0000 (16:55 +0200)
ooookay

1  2 
addons/stock/stock_view.xml

Simple merge