merge upstream
authorChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 17:08:49 +0000 (19:08 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 17:08:49 +0000 (19:08 +0200)
1  2 
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml

Simple merge