[MERGE] Merge trunk
authorRichard Mathot (OpenERP) <rim@openerp.com>
Wed, 12 Feb 2014 09:56:06 +0000 (10:56 +0100)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Wed, 12 Feb 2014 09:56:06 +0000 (10:56 +0100)
commit78f683d3d43bf07f8d9d1714e0bc90d4ffad9b90
treec8b8d62c58d83d54d6deeb4217050e5cd158bb00
parentfbbe8631c9edb2dacedcb99c1cd7c6bea6f42b33
parent0bbf709f5c7a6bc5700737bc2ae020f575224c00
[MERGE] Merge trunk

bzr revid: rim@openerp.com-20140212095606-n8e1q086m2996wxn
addons/hr_recruitment/__openerp__.py
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_data.xml
addons/hr_recruitment/hr_recruitment_view.xml