Merge branch 'template-toolkit-opac' of git://git.evergreen-ils.org/evergreen/equinox...
authorDan Scott <dan@coffeecode.net>
Mon, 13 Jun 2011 17:25:00 +0000 (13:25 -0400)
committerDan Scott <dan@coffeecode.net>
Mon, 13 Jun 2011 17:25:00 +0000 (13:25 -0400)
commitae3025777d94fddd89523b6490853c779af35256
tree00412186136006b951337fb812068b040e901b66
parent9ba076a2963d80e66749bbadc3fe916cfcdd7071
parentb1ee9ad4ef91240de7110d1748a5a3c57043da39
Merge branch 'template-toolkit-opac' of git://git.evergreen-ils.org/evergreen/equinox into dbs/template-toolkit-opac