[MERGE] with trunk
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 12 Jul 2013 13:19:13 +0000 (18:49 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Fri, 12 Jul 2013 13:19:13 +0000 (18:49 +0530)
bzr revid: fka@tinyerp.com-20130712131913-rbbk600xt3ru6uzw

1  2 
addons/crm/crm_lead_view.xml
addons/crm_claim/crm_claim_view.xml
addons/hr_expense/hr_expense_view.xml
addons/hr_recruitment/hr_recruitment_view.xml
addons/point_of_sale/point_of_sale_view.xml
addons/stock/stock_view.xml

Simple merge
Simple merge
Simple merge
Simple merge