[MERGE]: Merged with addons
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Tue, 13 Aug 2013 13:54:10 +0000 (19:24 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Tue, 13 Aug 2013 13:54:10 +0000 (19:24 +0530)
commit2e20b9a45a7bff8c38dc657bea86236b324cd639
tree49fc44a24ea894206c6cf63e2eda2e248435c9cc
parent4b98b1c6890eae3c007ee68e2f41a7a3b26a3623
parente8164c9a927ec8339252712bae3bf0a5ca1760e3
[MERGE]: Merged with addons

bzr revid: atp@tinyerp.com-20130813135410-7w9yfc6zl3hxcnwd
addons/crm/i18n/es_AR.po
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
addons/project/i18n/zh_CN.po