From: Bill Erickson Date: Thu, 11 Aug 2011 21:50:09 +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=7627afcb01179a956e7bfd785cd9e79fb46fabcc;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-master-merge --- 7627afcb01179a956e7bfd785cd9e79fb46fabcc