From: Mike Rylander Date: Fri, 20 May 2011 14:43:44 +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~23 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c471501f126dabf9852ede75b17b233cd6766ed6;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- c471501f126dabf9852ede75b17b233cd6766ed6