[MERGE] merge with latest trunk
authorAmit Bhavsar (Open ERP) <amb@tinyerp.com>
Thu, 22 Aug 2013 11:24:19 +0000 (16:54 +0530)
committerAmit Bhavsar (Open ERP) <amb@tinyerp.com>
Thu, 22 Aug 2013 11:24:19 +0000 (16:54 +0530)
bzr revid: amb@tinyerp.com-20130822112419-vz74jafyh2kavq76

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