Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

[mirror_qemu.git] / Changelog

diff --git a/Changelog b/Changelog
index 13eebefb7415524e492dc742f84e4d8cece376ab..4a90bb9e8b058b7e85b79aff31f3a238c84e63be 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,6 @@
 This file documents changes for QEMU releases 0.12 and earlier.
 For changelog information for later releases, see
-http://wiki.qemu.org/ChangeLog or look at the git history for
+https://wiki.qemu.org/ChangeLog or look at the git history for
 more detailed information.