From: Mike Rylander Date: Mon, 20 Jun 2011 15:52:10 +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~23 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=703fd891db1bcb409474fda7a0d4d510b05ee8f1;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- 703fd891db1bcb409474fda7a0d4d510b05ee8f1