civicrm/civihr — pull request #93 by vivekarora (2013-08-14 07:12:49+00:00)
Title: CRM-13184 - Code Merge

Fixed code merge issues.