Merge pull request #847 from eileenmcnaughton/master
authorKurund Jalmi <kurund@civicrm.org>
Fri, 24 May 2013 06:07:50 +0000 (23:07 -0700)
committerKurund Jalmi <kurund@civicrm.org>
Fri, 24 May 2013 06:07:50 +0000 (23:07 -0700)
commit380f917027df5a620254fd30df6aa4ae170a2e11
treef3aa3b321860a2964085d10e63317956af989172
parent31b28e78bf55bafd4784ff8814142e90285cb7d0
parent42d0c5d4e7a6a9d271b45a591469f78ae854bab0
Merge pull request #847 from eileenmcnaughton/master

this file seems to have 2 version with different mixes of case in git - remove one!