Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into...
authorMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 14:17:09 +0000 (10:17 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 13 Jun 2011 14:17:09 +0000 (10:17 -0400)

Trivial merge