From: Dan Scott Date: Fri, 19 Aug 2011 19:39:12 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/ttopac-master-merge X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3c4c4ef5f65c0ad961b47063e6ab1dde2ff35fa3;p=contrib%2FConifer.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/ttopac-master-merge --- 3c4c4ef5f65c0ad961b47063e6ab1dde2ff35fa3