Merge branch 'master' into master-pos-new-payment-screen-fva
authorFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Mon, 25 Aug 2014 14:42:57 +0000 (16:42 +0200)
committerFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Mon, 25 Aug 2014 14:42:57 +0000 (16:42 +0200)
Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml

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

Simple merge