[MERGE] merge with addons
authorAmit Vora (OpenERP Trainee) <voraamitr@gmail.com>
Thu, 22 Aug 2013 12:40:57 +0000 (18:10 +0530)
committerAmit Vora (OpenERP Trainee) <voraamitr@gmail.com>
Thu, 22 Aug 2013 12:40:57 +0000 (18:10 +0530)
bzr revid: voraamitr@gmail.com-20130822124057-rv6oqd0n22mf53c8

1  2 
addons/point_of_sale/point_of_sale.py

Simple merge