From: Mike Rylander Date: Fri, 27 May 2011 18:45:59 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac X-Git-Tag: sprint4-merge-nov22~5128^2~72^2~13^2 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8b8e12c7bf4dff7e9cb740804d9315aac8d67b5d;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- 8b8e12c7bf4dff7e9cb740804d9315aac8d67b5d