From: Mike Rylander <mrylander@gmail.com>
Date: Sun, 15 May 2011 17:42:15 +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=4cce9694a6d72dfebf90b1bb8c5fca6d452c5389

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

4cce9694a6d72dfebf90b1bb8c5fca6d452c5389