From: Bill Erickson Date: Wed, 29 Jun 2011 17:37:42 +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~10^2 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8b98ff9732ce921a68a28a25efe65096c2be788b;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- 8b98ff9732ce921a68a28a25efe65096c2be788b