From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 17 May 2011 14:19:09 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
X-Git-Url: http://git.equinoxoli.org/?p=evergreen-equinox.git;a=commitdiff_plain;h=6b47f0a3204ed395be9a2e93105741430d4d6835

Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac
---

6b47f0a3204ed395be9a2e93105741430d4d6835