From: Jane Sandberg <sandbej@linnbenton.edu>
Date: Fri, 17 Nov 2017 04:30:45 +0000 (-0800)
Subject: Merge branch 'rel_3_0' of git.evergreen-ils.org:Evergreen into rel_3_0
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=add2c11f4474f0f8466e341fef31f75a200e1e2f;p=working%2FEvergreen.git

Merge branch 'rel_3_0' of git.evergreen-ils.org:Evergreen into rel_3_0
---

add2c11f4474f0f8466e341fef31f75a200e1e2f