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