From: Jim Keenan <jkeenan@cwmars.org>
Date: Mon, 20 Jun 2016 11:50:25 +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=4d17930614400109e3647f26b8706794cf5606b1;p=working%2FEvergreen.git

Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into working_branch
---

4d17930614400109e3647f26b8706794cf5606b1