From: Mike Rylander Date: Wed, 18 May 2011 13:28:17 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac X-Git-Url: http://git.equinoxoli.org/?p=evergreen-equinox.git;a=commitdiff_plain;h=604f94f79ce5e238e917b02d36cb52f5e4880485 Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- 604f94f79ce5e238e917b02d36cb52f5e4880485