[MERGE] merge trunk into local branch
authorGery Debongnie <ged@openerp.com>
Thu, 16 Jan 2014 14:43:26 +0000 (15:43 +0100)
committerGery Debongnie <ged@openerp.com>
Thu, 16 Jan 2014 14:43:26 +0000 (15:43 +0100)
commit00c6d55ac9a5f94ba008e28cc9ae3eb6b49a76c1
treefa5f2c93657729284d0ed2795ca84ceaa2e59a44
parentbe0da788f6fca9d95c2d667e619bfc9939cefb65
parent58907da3ee30be831083f6dcc804c31e7b73df5a
[MERGE] merge trunk into local branch

bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
addons/crm/crm_lead_view.xml
addons/hr_recruitment/hr_recruitment_view.xml