From: Bill Erickson Date: Fri, 5 Aug 2011 18:57:03 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c186e123539192b23fddc6cd7683fe4a1c80c34c;p=evergreen%2Fpines.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-master-merge --- c186e123539192b23fddc6cd7683fe4a1c80c34c