merge

addons/account/account_invoice_view.xml

addons/account/report/general_ledger.py

addons/account/report/general_ledger.rml

addons/account/report/general_ledger_landscape.py

addons/account/report/general_ledger_landscape.rml

addons/account/report/overdue.py

addons/account/report/overdue.rml

addons/account_budget/__terp__.py

addons/account_budget/crossovered_budget_view.xml

addons/account_budget/report/budget_report.py

addons/account_budget/wizard/wizard_budget_report.py

addons/delivery/stock.py

addons/delivery/wizard/delivery_sale_order.py

addons/document/README.txt

addons/document/__init__.py

addons/document/__terp__.py

addons/document/content_index.py

addons/document/custom_report.xml

addons/document/custom_view.xml

addons/document/document.py