From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Mon, 11 Jul 2011 21:46:20 +0000 (-0400)
Subject: Merge branch 'template-toolkit-opac' of git://git.evergreen-ils.org/evergreen/equinox... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=cc95a8f360af2a2f03f4fe48e253fce0ff77e2cb;p=evergreen%2Fpines.git

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

cc95a8f360af2a2f03f4fe48e253fce0ff77e2cb