From: Bill Erickson Date: Mon, 5 Oct 2015 01:00:13 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/web-client-p3 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=17f799157d8980cefe29ac16a6c8c9a4e305e6be;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into collab/berick/web-client-p3 --- 17f799157d8980cefe29ac16a6c8c9a4e305e6be