[MERGE] quick fixes for the shopping cart display
authorFrédéric van der Essen <fva@openerp.com>
Wed, 31 Jul 2013 08:13:59 +0000 (10:13 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 31 Jul 2013 08:13:59 +0000 (10:13 +0200)
bzr revid: fva@openerp.com-20130731081359-xx2nrwzgl96eiztq


Trivial merge