Merge pull request #1099 from ravishnair/CiviHR
authorTim Otten <to-git@think.hm>
Wed, 3 Jul 2013 16:34:55 +0000 (09:34 -0700)
committerTim Otten <to-git@think.hm>
Wed, 3 Jul 2013 16:34:55 +0000 (09:34 -0700)
commit815bc3374dd87aea95fc9ca47b720786c37ee60c
tree32fc84b504da5a5cf42066088aed1983219448f8
parent80e799e4bcc80f52963990caccad2596c15528d6
parent136127f20db4f8555816b42942f85fb22684f0b1
Merge pull request #1099 from ravishnair/CiviHR

-- CRM-12941, CRM-12863 & CRM-12824 changes made as per the comments