[MERGE] merge with latest trunk
authorAmit Bhavsar (Open ERP) <amb@tinyerp.com>
Mon, 12 Aug 2013 12:12:19 +0000 (17:42 +0530)
committerAmit Bhavsar (Open ERP) <amb@tinyerp.com>
Mon, 12 Aug 2013 12:12:19 +0000 (17:42 +0530)
commit028d62c391cc920bb6863c57f0332f6d30dc2d7a
tree94f2a37b2ca53ab743fccccd34c6bf4e02e30191
parentf465b37c7399209c776cef8c98db2aa3fd4cdeb4
parent69e80d989c1123d9968106784f10b349510ce8e2
[MERGE] merge with latest trunk

bzr revid: amb@tinyerp.com-20130812121219-4opfk262kgmakvsb
addons/hr/hr.py
addons/hr_payroll/hr_payroll_view.xml
addons/hr_recruitment/hr_recruitment_view.xml