From: Bill Erickson Date: Wed, 25 Jun 2014 19:01:22 +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=6f4af491d93f64482e797d2f3f3a33f0cb75b44c;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto --- 6f4af491d93f64482e797d2f3f3a33f0cb75b44c