From: Bill Erickson Date: Thu, 25 Aug 2011 20:03:27 +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=5c43defce39395e1e254be914241ef9a39ef1b5a;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- 5c43defce39395e1e254be914241ef9a39ef1b5a