[MERGE] Merge parents
authorRichard Mathot (OpenERP) <rim@openerp.com>
Wed, 4 Dec 2013 14:40:55 +0000 (15:40 +0100)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Wed, 4 Dec 2013 14:40:55 +0000 (15:40 +0100)
commit290fa3b349c905355fc6c16aabc16042a8e82390
treed3f466946031c28bfcc570063225a364f0882b2c
parente04a4fa7265fb6e7c78db35c950761edf5a82998
parent67599578b630f5e511f11b0c6e46b99743df3b8a
[MERGE] Merge parents

bzr revid: rim@openerp.com-20131204144055-bmc36a63x07vjhlf
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_data.xml
addons/hr_recruitment/hr_recruitment_view.xml
addons/survey/static/src/css/survey.css
addons/website/views/website_templates.xml