Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac
authorBill Erickson <berick@esilibrary.com>
Fri, 18 May 2012 12:32:44 +0000 (08:32 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 18 May 2012 12:32:44 +0000 (08:32 -0400)

Trivial merge