[MERGE] Merged with main addons.
authorThibault Delavallée <tde@openerp.com>
Mon, 18 Jun 2012 07:57:32 +0000 (09:57 +0200)
committerThibault Delavallée <tde@openerp.com>
Mon, 18 Jun 2012 07:57:32 +0000 (09:57 +0200)
commit1675f545c67d80b9fc44404d817cc18b50d90fef
treeec6af2f8a2e83db92187956c0716cb0cdb39137d
parent52b4184a9830204d3490b41a0eb03c821a81ef10
parent10291e4673788e5459e62a6d5f1bd39769da049f
[MERGE] Merged with main addons.

bzr revid: tde@openerp.com-20120613153026-wh9mvahd4rzhxd4g
bzr revid: tde@openerp.com-20120614083838-algjw7i1z3mhtkot
bzr revid: tde@openerp.com-20120615081803-6r4vhj80saemj1vg
bzr revid: tde@openerp.com-20120618075732-jzenzam3takxe00o
addons/crm/crm_lead_view.xml
addons/crm/crm_meeting.py
addons/hr_holidays/hr_holidays.py
addons/hr_recruitment/hr_recruitment.py