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

Trivial merge