From: Bill Erickson Date: Tue, 29 Jul 2014 15:39:52 +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=478c2152b7fa60e141b07e57bb731d0acd0fce80;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into web-staff-proto --- 478c2152b7fa60e141b07e57bb731d0acd0fce80