[MERGE] trunk-wms
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 11 Mar 2014 13:32:00 +0000 (14:32 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 11 Mar 2014 13:32:00 +0000 (14:32 +0100)
commitd86520d4c9f7d873ed52f871638f09436a3680fd
tree4901866ca2ec5733ac72c8c43728c72151dd4300
parent38afcf4d61ca18920eeec33d1cdc9db227ed42e9
parentda210e4b5e6d935d20571bb981759a73116ff64d
[MERGE] trunk-wms

bzr revid: qdp-launchpad@openerp.com-20140311133200-7iltr7u47got8vc7