null merge

diff --cc Misc/NEWS
index 3a2c1ecf289de2255bcf621da00d53a8e10c2611,a5b78db933ded7d0c5331996e5eba90ce7c313e8..aea5b1342d228ad18e921537118aaf5df25996f1
--- 1/Misc/NEWS
--- 2/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