[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)
commit073bf7d93791b51c2055b81040ae47dc310a54a8
tree863b42e3c1b0dc30805526156d9140fa8c6a8603
parent41dfa955815d6b268057111535a9ea90d779032e
parentef879b133f9ff368bedf0778b50cd56961530654
[MERGE] merge with latest trunk

bzr revid: amb@tinyerp.com-20130822112419-vz74jafyh2kavq76
addons/hr_recruitment/hr_recruitment.py
addons/hr_recruitment/hr_recruitment_view.xml