From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 22 Jun 2014 20:28:04 +0000 (+0200)
Subject: Issue #10747: Merge with 3.4
X-Git-Tag: v3.5.0a1~1440
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77143dbaee8aa15c2f3556438babd0adfbe0dc0f;p=python

Issue #10747: Merge with 3.4
---

77143dbaee8aa15c2f3556438babd0adfbe0dc0f
diff --cc Misc/NEWS
index 81bf254f9c,128937ef87..b6042b28ef
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1,4 -1,4 +1,4 @@@
--+++++++++++
+++++++++++++
  Python News
  +++++++++++
  
@@@ -679,12 -530,6 +679,14 @@@ Tools/Demo
  - Issue #20535: PYTHONWARNING no longer affects the run_tests.py script.
    Patch by Arfrever Frehtes Taifersar Arahesis.
  
 +Windows
 +-------
 +
 +- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
 +  updated to 1.0.1h.
 +
++- Issue #10747: Use versioned labels in the Windows start menu.
++  Patch by Olive Kilburn.
  
  What's New in Python 3.4.0?
  ===========================