Merge branch 'template-toolkit-opac' of git://git.evergreen-ils.org/evergreen/equinox...
authorLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Fri, 29 Jul 2011 16:34:26 +0000 (12:34 -0400)
committerLebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Fri, 29 Jul 2011 16:34:26 +0000 (12:34 -0400)

Trivial merge