Merge branch 'template-toolkit-opac' of git://git.evergreen-ils.org/evergreen/equinox...
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 11 Jul 2011 21:46:20 +0000 (17:46 -0400)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Mon, 11 Jul 2011 21:46:20 +0000 (17:46 -0400)

Trivial merge