Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Tue, 29 Jul 2014 15:39:52 +0000 (11:39 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 29 Jul 2014 15:39:52 +0000 (11:39 -0400)

Trivial merge