Merge branch 'master' of git.evergreen-ils.org:contrib/pines
authorChris Sharp <awitter@georgialibraries.org>
Mon, 1 Oct 2012 15:44:00 +0000 (11:44 -0400)
committerChris Sharp <awitter@georgialibraries.org>
Mon, 1 Oct 2012 15:44:00 +0000 (11:44 -0400)

Trivial merge