From: Mike Rylander <mrylander@gmail.com>
Date: Thu, 9 Jun 2011 18:07:12 +0000 (-0400)
Subject: Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9c760edbb7e04916097cd70e223709f5ff099c0d;p=evergreen%2Fpines.git

Merge branch 'template-toolkit-opac' of git.evergreen-ils.org:evergreen/equinox into template-toolkit-opac
---

9c760edbb7e04916097cd70e223709f5ff099c0d