[MERGE]
authorChristophe Simonis <chs@tinyerp.com>
Tue, 12 Jan 2010 16:03:41 +0000 (17:03 +0100)
committerChristophe Simonis <chs@tinyerp.com>
Tue, 12 Jan 2010 16:03:41 +0000 (17:03 +0100)
commit74b7f573ea503bcaddb117688e7979647fa6709f
treec27136e141e0316b8cb1c0ee6161b545376a0785
parent73f60db270a24bf79caa48c2ad1549d2fe7cab47
parent9703dc77abe1a9cc8e1dbd985ef4ea184179fab8
[MERGE]

bzr revid: chs@tinyerp.com-20100112160341-uloolawazbybx01w
addons/account/account.py
addons/account/company.py
addons/base_setup/wizard/wizard_base_setup.py
addons/crm/crm_config.py
addons/document_ftp/doc_conf_wizard.py
addons/document_ics/document_ics_config_wizard.py
addons/profile_accounting/profile_accounting.py
addons/profile_association/profile_association.py
addons/profile_manufacturing/profile_manufacturing.py
addons/profile_service/profile_service.py
addons/sale/sale.py