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