[MERGE]merge with latest trunk-wms
authorCedric Snauwaert <csn@openerp.com>
Mon, 10 Feb 2014 16:43:42 +0000 (17:43 +0100)
committerCedric Snauwaert <csn@openerp.com>
Mon, 10 Feb 2014 16:43:42 +0000 (17:43 +0100)
commit6bc5056f3e06fc0b24edc8e3578d512dcd8698e1
tree907a851c0054ce77ee772ac5ed1f46b19fb57d80
parent3ba9e8715a1517b9708ca4f027166166fcb1eef3
parent9b249181e381d837c696ee678a72748472d9f5cd
[MERGE]merge with latest trunk-wms

bzr revid: csn@openerp.com-20140210164342-3x81l53zy1n43mwy