[MERGE] Merged with mail-state-tde branch, recently udpated with trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 15 Jun 2012 08:40:06 +0000 (10:40 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 15 Jun 2012 08:40:06 +0000 (10:40 +0200)
commit5292250c0a04add4a1d3fd13af05483bc73299ad
tree848b1e08b630e879840d9bc6d85bf73b36e75fd0
parentc82893480236746fd29362f236df3d6b59b8b2fd
parent1675f545c67d80b9fc44404d817cc18b50d90fef
[MERGE] Merged with mail-state-tde branch, recently udpated with trunk.

bzr revid: tde@openerp.com-20120615084006-krv0lotdahcrx1ga
addons/crm/crm_lead_view.xml
addons/hr_recruitment/hr_recruitment_data.xml