civicrm/civihr — pull request #442 by yashodha (2014-03-06 06:36:59+00:00)
Title: merging 1.2 to master

merge 1.2 into master