From: Mike Rylander Date: Wed, 1 Jun 2011 15:49:36 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac X-Git-Tag: sprint4-merge-nov22~5128^2~72^2~12 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=fa1ef0cf51f37367c01a2f86b2e29a9651ef59b6;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- fa1ef0cf51f37367c01a2f86b2e29a9651ef59b6