[MERGE] Merge from trunk-wms
authorJosse Colpaert <jco@openerp.com>
Wed, 12 Mar 2014 20:43:10 +0000 (21:43 +0100)
committerJosse Colpaert <jco@openerp.com>
Wed, 12 Mar 2014 20:43:10 +0000 (21:43 +0100)
commitc33696449acf12e5af3d50ce15f0082b4621b653
treec8c1c4027cff9fee1e224070298fc978f4c20b95
parent04115a42d3a3623545d9343c21119e6c70ea01d6
parentb70f1e4472a59c46ec50136e53bb2e5a3d3258e5
[MERGE] Merge from trunk-wms

bzr revid: jco@openerp.com-20140312204310-goe4kfirt4o8q0o8