[MERGE] Merge parents
authorRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 12 Nov 2013 07:48:57 +0000 (08:48 +0100)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Tue, 12 Nov 2013 07:48:57 +0000 (08:48 +0100)
bzr revid: rim@openerp.com-20131112074857-5wm8a1xupyokeka0

1  2 
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_view.xml