From: Bill Erickson Date: Fri, 2 Sep 2011 16:25:22 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac... X-Git-Tag: sprint4-merge-nov22~5128^2~25 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a50662d93bac54c92e3e4672cde8f0fefc680602;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-master-merge --- a50662d93bac54c92e3e4672cde8f0fefc680602