[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)
commit29903b2daca1f6dabfa403685b017b4fe6b521e9
tree8ed2c838d566373cb61ba542845659a9b4f78444
parent0a0e58a04d968b324bc62a6dfc688787b24f2f24
parent46072d92efdc09299041625d5cf1d6acbbd8db95
[MERGE] Merge parents

bzr revid: rim@openerp.com-20131112074857-5wm8a1xupyokeka0
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_view.xml