From: Larry Hastings <larry@hastings.org>
Date: Sun, 24 Jun 2012 21:34:49 +0000 (-0700)
Subject: Restore Misc/NEWS entries lost in the merge for the previous commit.
X-Git-Tag: v3.3.0b1~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6bdc8f2dd0d8cb495e61d08f1db9e0e19c03b1d;p=thirdparty%2FPython%2Fcpython.git

Restore Misc/NEWS entries lost in the merge for the previous commit.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index d409b0c3d6d5..ebb2f02c1bb9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -62,6 +62,10 @@ Library
 - Issue #15164: Change return value of platform.uname() from a
   plain tuple to a collections.namedtuple.
 
+- Support Mageia Linux in the platform module.
+
+- Issue #11678: Support Arch linux in the platform module.
+
 - Issue #15118: Change return value of os.uname() and os.times() from
   plain tuples to immutable iterable objects with named attributes
   (structseq objects).