Merge branch 'master' of git.evergreen-ils.org:Evergreen into long-overdue
authorBill Erickson <berick@esilibrary.com>
Mon, 22 Apr 2013 15:12:03 +0000 (11:12 -0400)
committerBill Erickson <berick@esilibrary.com>
Mon, 22 Apr 2013 15:12:03 +0000 (11:12 -0400)

Trivial merge