From: Bill Erickson Date: Mon, 17 Mar 2014 18:50:56 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e847b1e6cdf91fb2be8a851f4ee7586aa8ae1450;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto --- e847b1e6cdf91fb2be8a851f4ee7586aa8ae1450