merges

addons/.project

addons/.project.moved

addons/.pydevproject

addons/account/__terp__.py

addons/account/i18n/fr_FR.po

addons/account/process/invoice_process.xml

addons/account/process/statement_process.xml

addons/account/project/report/analytic_balance.rml

addons/account/project/report/analytic_check.py

addons/account/project/report/analytic_check.rml

addons/account/report/general_ledger.rml

addons/account_analytic_analysis/i18n/fr_FR.po

addons/account_analytic_default/i18n/fr_FR.po

addons/account_analytic_plans/i18n/fr_FR.po

addons/account_balance/i18n/fr_FR.po

...s/account_balance/wizard/wizard_account_balance_report.py

addons/account_date_check/i18n/fr_FR.po

addons/account_followup/i18n/fr_FR.po

addons/account_invoice_layout/i18n/fr_FR.po

addons/account_report/account.py