Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto
authorBill Erickson <berick@esilibrary.com>
Wed, 25 Jun 2014 19:01:22 +0000 (15:01 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 25 Jun 2014 19:01:22 +0000 (15:01 -0400)

Trivial merge