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

Trivial merge