Merge branch 'hr-130' of git://github.com/dakshayani/civicrm-core into pull-request...
authorTim Otten <totten@civicrm.org>
Thu, 17 Oct 2013 12:48:25 +0000 (18:18 +0530)
committerTim Otten <totten@civicrm.org>
Thu, 17 Oct 2013 12:48:25 +0000 (18:18 +0530)
commit1990e4917eb436d303075af6c420bd1eda4c68f8
tree4d2e0bc9d97f2e16dea140489b69f2dcbdcce87b
parent975cb25ce487df99cd85007450403af12b4f8ccc
parent44b74e45ade914fcf456232f5d69886cc4252a1f
Merge branch 'hr-130' of git://github.com/dakshayani/civicrm-core into pull-request-1713