Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into...
authorMike Rylander <mrylander@gmail.com>
Mon, 11 Jul 2011 20:16:22 +0000 (16:16 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 11 Jul 2011 20:16:22 +0000 (16:16 -0400)

Trivial merge