From: Mike Rylander Date: Thu, 23 Jun 2011 17:57:57 +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~18 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=92515141688f96c0a8848f239e7bb117a6e99a42;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- 92515141688f96c0a8848f239e7bb117a6e99a42