merge

addons/account/account_menuitem.xml

addons/account/account_wizard.xml

addons/account/project/report/cost_ledger.rml

addons/account/project/report/quantity_cost_ledger.rml

addons/account/report/account_balance.py

addons/account/wizard/wizard_account_balance_report.py

addons/account/wizard/wizard_general_ledger_report.py

addons/account_report/__init__.py

addons/account_report/__terp__.py

addons/account_report/account.py

addons/account_report/account_report.xml

addons/account_report/account_wizard.xml

addons/account_report/wizard/__init__.py

addons/account_report/wizard/wizard_print_indicators.py

addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py

addons/mrp/__terp__.py

addons/mrp/mrp.py

addons/mrp/mrp_view.xml

addons/mrp/report/order.py

addons/mrp/report/order.rml