From: Mike Rylander <mrylander@gmail.com>
Date: Mon, 16 May 2011 15:12:40 +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=f4cd158b5df5cd4ae39a8c5fb9634b961d9a3aa9

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

f4cd158b5df5cd4ae39a8c5fb9634b961d9a3aa9