Merge branch 'tags/rel_2_7_1' of git://git.evergreen-ils.org/Evergreen into rel_2_7_1
authorChris Sharp <csharp@georgialibraries.org>
Thu, 6 Nov 2014 18:19:33 +0000 (13:19 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Thu, 6 Nov 2014 18:19:33 +0000 (13:19 -0500)
commit52be3dae874748f7af5fa524ea0a844f9aea85f0
treed4de38fce6d18525c15587273f10a79a7c10b4ea
parent593f90021fba289cdfe0fc3c2432f579b8ecacae
parente9667172a9b03165837df776862ca7ed83f5ab69
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