From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 10 Dec 2011 22:55:31 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~640
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bbe788deb774d066e8d185b1af04af3b4537dfc;p=thirdparty%2FPython%2Fcpython.git

merge heads
---

8bbe788deb774d066e8d185b1af04af3b4537dfc
diff --cc Misc/NEWS
index 16cda4232f85,813fe543e02a..81b98db17b19
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -406,8 -406,8 +406,10 @@@ Core and Builtin
  Library
  -------
  
 +- Alias resource.error to OSError ala PEP 3151.
 +
+ - Issue #5689: Add support for lzma compression to the tarfile module.
+ 
  - Issue #13248: Turn 3.2's PendingDeprecationWarning into 3.3's
    DeprecationWarning.  It covers 'cgi.escape', 'importlib.abc.PyLoader',
    'importlib.abc.PyPycLoader', 'nntplib.NNTP.xgtitle', 'nntplib.NNTP.xpath',