From: Bill Erickson <berick@esilibrary.com>
Date: Wed, 26 Jan 2011 20:14:26 +0000 (-0500)
Subject: Merge branch 'opac-tt-poc' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen... 
X-Git-Tag: opac-tt-poc-demo2~87
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6f273f01ba8fa51d2a3614587546345afd894d51;p=evergreen%2Fequinox.git

Merge branch 'opac-tt-poc' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into opac-tt-poc

Conflicts:
	Open-ILS/src/perlmods/OpenILS/WWW/EGCatLoader.pm
---

6f273f01ba8fa51d2a3614587546345afd894d51