merge

addons/account/account_move_line.py

addons/account/i18n/zh_CN.po

addons/account/report/account_journal.py

addons/account/report/invoice.rml

addons/account_analytic_analysis/i18n/zh_CN.po

addons/account_followup/__openerp__.py

addons/account_payment/test/account_payment.yml

addons/auction/wizard/auction_lots_buyer_map.py

addons/auction/wizard/auction_lots_make_invoice.py

addons/auction/wizard/auction_lots_make_invoice_buyer.py

addons/base_action_rule/base_action_rule.py

addons/base_calendar/base_calendar.py

addons/base_contact/test/base_contact00.yml

addons/base_setup/__init__.py

addons/base_setup/base_setup_data.xml

addons/base_setup/base_setup_todo.xml

addons/board/board_view.xml

addons/crm/crm.py

addons/crm/crm_lead.py

addons/crm/crm_lead_view.xml