Merge branch 'template-toolkit-opac' of git://git.evergreen-ils.org/evergreen/equinox...
authorDan Scott <dan@coffeecode.net>
Wed, 29 Jun 2011 18:44:28 +0000 (14:44 -0400)
committerDan Scott <dan@coffeecode.net>
Wed, 29 Jun 2011 18:44:28 +0000 (14:44 -0400)

Trivial merge