[MERGE] weight uom reviewed by dle
authorAntony Lesuisse <al@openerp.com>
Mon, 17 Dec 2012 16:50:15 +0000 (17:50 +0100)
committerAntony Lesuisse <al@openerp.com>
Mon, 17 Dec 2012 16:50:15 +0000 (17:50 +0100)
bzr revid: al@openerp.com-20121217165015-q8a7teke182yorht


Trivial merge