From: Chris Sharp <csharp@georgialibraries.org>
Date: Thu, 6 Nov 2014 18:19:33 +0000 (-0500)
Subject: Merge branch 'tags/rel_2_7_1' of git://git.evergreen-ils.org/Evergreen into rel_2_7_1
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=52be3dae874748f7af5fa524ea0a844f9aea85f0;p=evergreen%2Fpines.git

Merge branch 'tags/rel_2_7_1' of git://git.evergreen-ils.org/Evergreen into rel_2_7_1

Conflicts:
	Open-ILS/src/templates/opac/parts/record/copy_table.tt2
---

52be3dae874748f7af5fa524ea0a844f9aea85f0