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