Merge branch 'kpac' of git.evergreen-ils.org:evergreen/equinox into kpac2
authorBill Erickson <berick@esilibrary.com>
Mon, 21 May 2012 19:42:49 +0000 (15:42 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 21 May 2012 19:42:49 +0000 (15:42 -0400)
commit3ca050fb8c4947b6039ed88213b07f027ec624eb
treec0734a866f915b4334cfd0b6728e6c51dc84d0de
parent3eba07135481898ad06fbc74b4cd278bfd30ea3e
parented40046c1f4dd691430a0ba2427c1759274c3212
Merge branch 'kpac' of git.evergreen-ils.org:evergreen/equinox into kpac2