Merge branch 'kpac' of git.evergreen-ils.org:evergreen/equinox into kpac2
authorBill Erickson <berick@esilibrary.com>
Mon, 23 Apr 2012 19:44:46 +0000 (15:44 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 23 Apr 2012 19:44:46 +0000 (15:44 -0400)
commit45f910c60d19ea79c6f2b4f61849e08e9ad33f6d
tree55a589d68006705adb449121f2f68f406f11abca
parent1b6284b0f0f46d59cd63365e4fad2283921236e7
parentccf932011e2f73ed0bb4e63c1069f90c32b6cf83
Merge branch 'kpac' of git.evergreen-ils.org:evergreen/equinox into kpac2