[MERGE] staging branch with misc fixes
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 18 Dec 2012 15:20:05 +0000 (16:20 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 18 Dec 2012 15:20:05 +0000 (16:20 +0100)
commit0e77d6698900e338bf94d8b8f5a50579b5875286
tree8cc911e4e7622c525423e3888bf3af9a36ee78f7
parent33ee4d09d02d8752a2666c1a36b89f25d2ff93ea
parent588386ca05b87ee01ed81c98ba71d531404df77a
[MERGE] staging branch with misc fixes

bzr revid: qdp-launchpad@openerp.com-20121218152005-a1gahm72g6wylrg3
addons/crm/crm_lead.py
addons/crm/crm_lead_view.xml