From: Jim Keenan Date: Fri, 12 Aug 2016 17:37:26 +0000 (-0400) Subject: Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_branch X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7a56256827aeef309f9a1fb57af0510c86befbd7;p=working%2FEvergreen.git Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_branch --- 7a56256827aeef309f9a1fb57af0510c86befbd7