From: Bill Erickson Date: Wed, 27 Jul 2011 20:44:49 +0000 (-0400) Subject: Merge branch 'rel_2_1' of git.evergreen-ils.org:Evergreen into template-toolkit-opac... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5007f03bc6a9d5e2f434f68c5853eb26297aed26;p=evergreen%2Fequinox.git Merge branch 'rel_2_1' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-rel_2_1 --- 5007f03bc6a9d5e2f434f68c5853eb26297aed26