From: Mike Rylander Date: Fri, 13 May 2011 17:20:12 +0000 (-0400) Subject: Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin... X-Git-Url: http://git.equinoxoli.org/?p=evergreen-equinox.git;a=commitdiff_plain;h=c300b4a91a3c259eb4ad0e69bc35f206aa903e3b Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into template-toolkit-opac --- c300b4a91a3c259eb4ad0e69bc35f206aa903e3b