From: Mike Rylander Date: Tue, 2 Aug 2011 18:39:31 +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=024c72c037287e34550cddeb5d9131cc782e910f;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- 024c72c037287e34550cddeb5d9131cc782e910f