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