Merge branch 'rel_2_5_1' of git.evergreen-ils.org:/evergreen/pines into rel_2_5_1
authorChris Sharp <csharp@georgialibraries.org>
Tue, 16 Sep 2014 11:50:47 +0000 (07:50 -0400)
committerChris Sharp <csharp@georgialibraries.org>
Tue, 16 Sep 2014 11:50:47 +0000 (07:50 -0400)

Trivial merge