Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorJane Sandberg <sandbej@linnbenton.edu>
Wed, 18 Oct 2017 14:39:52 +0000 (07:39 -0700)
committerJane Sandberg <sandbej@linnbenton.edu>
Wed, 18 Oct 2017 14:39:52 +0000 (07:39 -0700)

Trivial merge