Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac kpac-scratch
authorBill Erickson <berick@esilibrary.com>
Wed, 18 Apr 2012 12:56:14 +0000 (08:56 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 18 Apr 2012 12:56:14 +0000 (08:56 -0400)

Trivial merge