[Merge]

bin/addons/base/__openerp__.py

bin/addons/base/base_data.xml

bin/addons/base/base_update.xml

bin/addons/base/i18n/hr.po

bin/addons/base/i18n/it.po

bin/addons/base/i18n/ja.po

bin/addons/base/i18n/mn.po

bin/addons/base/i18n/pt_BR.po

bin/addons/base/i18n/sv.po

bin/addons/base/i18n/uk.po

bin/addons/base/ir/ir.xml

bin/addons/base/ir/ir_cron.py

bin/addons/base/module/wizard/__init__.py

bin/addons/base/module/wizard/base_export_language.py

bin/addons/base/module/wizard/base_export_language_view.xml

bin/addons/base/module/wizard/base_import_language.py

bin/addons/base/module/wizard/base_import_language_view.xml

bin/addons/base/module/wizard/base_module_configuration.py

...ons/base/module/wizard/base_module_configuration_view.xml

bin/addons/base/module/wizard/base_module_scan.py