From: Christian Heimes <christian@cheimes.de>
Date: Thu, 21 Nov 2013 15:27:33 +0000 (+0100)
Subject: merge
X-Git-Tag: v3.4.0b1~147
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b627602214c264a65d4fc9826988e19a8c8e9a9;p=thirdparty%2FPython%2Fcpython.git

merge
---

1b627602214c264a65d4fc9826988e19a8c8e9a9
diff --cc Misc/NEWS
index d47cefd8244f,60adc5803255..9d6287f00627
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -59,9 -59,8 +59,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #19682: Fix compatibility issue with old version of OpenSSL that
 +  was introduced by Issue #18379.
 +
+ - Issue #14455: plistlib now supports binary plists and has an updated API.
+ 
  - Issue #19633: Fixed writing not compressed 16- and 32-bit wave files on
    big-endian platforms.