From: Bill Erickson Date: Tue, 5 Jul 2011 20:38:21 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac X-Git-Tag: sprint4-merge-nov22~5128^2~76^2~8^2 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a6ccd35604c9c90b873d78b5ce83cb727f90bab2;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- a6ccd35604c9c90b873d78b5ce83cb727f90bab2