[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Mon, 5 Aug 2013 13:26:18 +0000 (15:26 +0200)
committerThibault Delavallée <tde@openerp.com>
Mon, 5 Aug 2013 13:26:18 +0000 (15:26 +0200)
commitdce673c6b5b7bf8f0f1c10d5aee0d86493c8eee7
tree8dede687b24ecace96fdea2354fa13fe633ef6ce
parent2b757c4bf084dc56853b95a1110228a4a817d62f
parentade561e1cc4ba0e444a9dc521a6fc243eccd3f69
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130805132618-ewjjxjfwnkeg8hue
addons/crm/crm_action_rule_demo.xml
addons/crm/crm_lead.py
addons/crm/crm_lead_data.xml
addons/crm/crm_lead_view.xml
addons/point_of_sale/i18n/zh_CN.po
addons/stock/i18n/zh_CN.po