Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into...
authorMike Rylander <mrylander@gmail.com>
Sun, 24 Jul 2011 15:14:19 +0000 (11:14 -0400)
committerMike Rylander <mrylander@gmail.com>
Sun, 24 Jul 2011 15:14:19 +0000 (11:14 -0400)

Trivial merge