[merge] from trunk
authorXavier Morel <xmo@tinyerp.com>
Wed, 30 Dec 2009 13:25:01 +0000 (14:25 +0100)
committerXavier Morel <xmo@tinyerp.com>
Wed, 30 Dec 2009 13:25:01 +0000 (14:25 +0100)
commit829bce5ea93d7d8e83af8d9c401f46bba8c90256
treefa5537f711857955d10258e2a69dd863bee5e7d1
parent5855e5861a616f10de852c1e12f0e511e9b52fd0
parent625e67df3b3178b2fc5d22ddd469622c544ef866
[merge] from trunk

bzr revid: xmo@tinyerp.com-20091230132501-eioxs2a7fdpj2j6m
addons/crm/crm_view.xml
addons/document_ftp/doc_conf_wizard.py
addons/sale/sale.py