[MERGE] Upstream
authorStephane Wirtel <stw@openerp.com>
Thu, 22 Sep 2011 13:14:29 +0000 (15:14 +0200)
committerStephane Wirtel <stw@openerp.com>
Thu, 22 Sep 2011 13:14:29 +0000 (15:14 +0200)
commit8a06c9f209f0c4f47fbe5fdd29aa7ab50b52069b
tree7d0c59979b42ee0f8628d53607fb5e2278302ccf
parente123082d881476ca32eab028550a453e2dde80b2
parent4d18a8a61450e9f5beabd4993ba2df71125fb80e
[MERGE] Upstream

bzr revid: stw@openerp.com-20110922131429-vlgqxnb37jsoaq5l
addons/base_setup/base_setup_views.xml
addons/crm/crm_installer_view.xml