[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 26 Nov 2013 14:23:28 +0000 (15:23 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 26 Nov 2013 14:23:28 +0000 (15:23 +0100)
bzr revid: fva@openerp.com-20131126142328-26gdibac45v17djm

1  2 
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml

Simple merge