From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sat, 13 Apr 2013 15:07:15 +0000 (+0300)
Subject: null merge
X-Git-Tag: v2.7.5~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=524773020a612d1f75732a9759fe1872531ba1c9;p=thirdparty%2FPython%2Fcpython.git

null merge
---

524773020a612d1f75732a9759fe1872531ba1c9
diff --cc Misc/NEWS
index 3a2c1ecf289d,a5b78db933de..aea5b1342d22
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -25,14 -25,8 +25,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #17536: Add to webbrowser's browser list: xdg-open, gvfs-open,
 +  www-browser, x-www-browser, chromium browsers, iceweasel, iceape.
 +
  - Issue #17656: Fix extraction of zip files with unicode member paths.
  
- - Issue #13355: Raise ValueError on random.triangular call with invalid params.
-   Initial patch by Yuriy Senko.
- 
  - Issue #17666: Fix reading gzip files with an extra field.
  
  - Issue #13150, #17512: sysconfig no longer parses the Makefile and config.h