From: Bill Erickson Date: Fri, 18 May 2012 12:32:44 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ed40046c1f4dd691430a0ba2427c1759274c3212;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into kpac --- ed40046c1f4dd691430a0ba2427c1759274c3212