From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Wed, 7 May 2014 16:22:17 +0000 (-0700)
Subject: Merge branch 'master' into Gtk.
X-Git-Tag: mit-scheme-pucked-9.2.12~413
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f0a851f091786c3801ffa8c5a30fc3bcfca88f7c;p=mit-scheme.git

Merge branch 'master' into Gtk.
---

f0a851f091786c3801ffa8c5a30fc3bcfca88f7c
diff --cc src/runtime/runtime.pkg
index ea6aac30e,47b1729bc..9714c3f96
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@@ -3341,7 -3341,7 +3341,8 @@@ USA
  	  link-shim
  	  install-shim
  	  install-load-option
 -	  install-html)
++	  install-html
 +	  load-option/suppress-loading-message?)
    (initialization (initialize-package!)))
  
  (define-package (runtime program-copier)