Merge remote-tracking branch 'esi/pines-tpac-galileo' into 2.5-beta1-galileo
authorChris Sharp <csharp@georgialibraries.org>
Wed, 16 Oct 2013 12:34:22 +0000 (08:34 -0400)
committerChris Sharp <csharp@georgialibraries.org>
Wed, 16 Oct 2013 12:34:22 +0000 (08:34 -0400)
commit5975166033f7fe1205fd3308e612d0772f439a61
tree7d7e5353beadba9010bf8fa0a26b4e31eb7ae1b9
parent30ba996e05116976588fda08963020c42ba32300
parentfae1895bb508ec63590de8728617c9b10329b03c
Merge remote-tracking branch 'esi/pines-tpac-galileo' into 2.5-beta1-galileo

Conflicts:
Open-ILS/src/templates/opac/parts/footer.tt2
Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Open-ILS/src/templates/opac/parts/footer.tt2