Merge branch 'master' of git.evergreen-ils.org:Evergreen
authorJane Sandberg <sandbej@linnbenton.edu>
Tue, 19 Sep 2017 03:02:11 +0000 (20:02 -0700)
committerJane Sandberg <sandbej@linnbenton.edu>
Tue, 19 Sep 2017 03:02:11 +0000 (20:02 -0700)

Trivial merge