From: Bill Erickson Date: Mon, 29 Aug 2011 15:23:54 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac X-Git-Tag: sprint4-merge-nov22~5128^2~41^2 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d1b79a261ce05c385cfe334d829470fd63966f37;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- d1b79a261ce05c385cfe334d829470fd63966f37