From: Bill Erickson Date: Thu, 8 Sep 2011 21:52:01 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac... X-Git-Tag: sprint4-merge-nov22~5128^2~18 X-Git-Url: https://git.evergreen-ils.org/?p=working%2FEvergreen.git;a=commitdiff_plain;h=7f1e214e51edc9ba0cd2beb5a6693325bdebb820 Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-master-merge --- 7f1e214e51edc9ba0cd2beb5a6693325bdebb820