From: Mike Rylander Date: Thu, 26 May 2011 17:12:05 +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~16 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f335a598496a253cd38eb76d210750b849d6b09e;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac --- f335a598496a253cd38eb76d210750b849d6b09e