[MERGE] Merge from trunk-wms
authorJosse Colpaert <jco@openerp.com>
Mon, 5 May 2014 08:03:20 +0000 (10:03 +0200)
committerJosse Colpaert <jco@openerp.com>
Mon, 5 May 2014 08:03:20 +0000 (10:03 +0200)
bzr revid: jco@openerp.com-20140505080320-ity6lx0dtgq5g1n7


Trivial merge