From: Bill Erickson Date: Wed, 20 Jul 2011 18:19:41 +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~2^2~5 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4885d3ae21cda410e61a6841eea4614819acb116;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- 4885d3ae21cda410e61a6841eea4614819acb116