Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 15:31:07 +0000 (11:31 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 21 Jun 2011 15:31:07 +0000 (11:31 -0400)

Trivial merge