Merge branch 'rel_2_7_1' of git.evergreen-ils.org:/evergreen/pines into rel_2_7_1
authorChris Sharp <csharp@georgialibraries.org>
Sun, 21 Dec 2014 03:43:40 +0000 (22:43 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Sun, 21 Dec 2014 03:43:40 +0000 (22:43 -0500)

Trivial merge