From: Jim Keenan Date: Wed, 15 Jun 2016 18:25:06 +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=ec16c1d48b928f0a0a8b98f95838620befca469c;p=working%2FEvergreen.git Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_branch Catching my local working_branch up to current --- ec16c1d48b928f0a0a8b98f95838620befca469c