Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Tue, 26 Nov 2013 19:07:14 +0000 (14:07 -0500)
committerBill Erickson <berick@esilibrary.com>
Tue, 26 Nov 2013 19:07:14 +0000 (14:07 -0500)

Trivial merge