[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)
bzr revid: qdp-launchpad@openerp.com-20140311133200-7iltr7u47got8vc7


Trivial merge