Merge branch 'kpac-scratch' of git.evergreen-ils.org:evergreen/equinox into kpac2 kpac2-orig
authorBill Erickson <berick@esilibrary.com>
Tue, 17 Apr 2012 14:40:55 +0000 (10:40 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 17 Apr 2012 14:40:55 +0000 (10:40 -0400)
commitc75eaace4f1129934b8e0e99ecf977f23178a319
tree2d8a31ba1d4e7d61a63dca069631d52c3b0b453c
parent0a9a4e637e5d388bea650eb50434a41a8579fa5a
parenta31890ee716547a533c8621785b2794f43f6d397
Merge branch 'kpac-scratch' of git.evergreen-ils.org:evergreen/equinox into kpac2