Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorBill Erickson <berick@esilibrary.com>
Fri, 2 Sep 2011 12:40:07 +0000 (08:40 -0400)
committerBill Erickson <berick@esilibrary.com>
Fri, 2 Sep 2011 12:40:07 +0000 (08:40 -0400)

Trivial merge