Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
authorMike Rylander <mrylander@gmail.com>
Wed, 6 Jul 2011 01:09:37 +0000 (21:09 -0400)
committerMike Rylander <mrylander@gmail.com>
Wed, 6 Jul 2011 01:09:37 +0000 (21:09 -0400)

Trivial merge