[MERGE] merged the branch with split of delivery/incomming shipments concepts
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 2 May 2012 18:41:14 +0000 (20:41 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 2 May 2012 18:41:14 +0000 (20:41 +0200)
bzr revid: qdp-launchpad@openerp.com-20120502184114-hnm6q60xrf27eh2c


Trivial merge