commit f70fd7092df0dd815b15104994ff84592b05b1fb
author Florent Xicluna <florent.xicluna@gmail.com> Sun Oct 30 20:24:40 2011 +0100
committer Florent Xicluna <florent.xicluna@gmail.com> Sun Oct 30 20:24:40 2011 +0100
tree d740225fcebdecd7aa7a88e95045d065d815c950
parent 1cebc207ea415f96a56f23b520adddeda3364fdc
parent 93dfee1dfc0bf572d4d9579fd455a72c0c81f148

Merge 3.2

Misc/NEWS

diff --git a/Misc/NEWS b/Misc/NEWS
index 7c51810..02374aa 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -340,9 +340,15 @@
 - Issue #12380: The rjust, ljust and center methods of bytes and bytearray
   now accept a bytearray argument.
 
+
 Library
 -------
 
+- Issue #13293: Better error message when trying to marshal bytes using
+  xmlrpc.client.
+
+- Issue #13291: NameError in xmlrpc package.
+
 - Issue #13258: Use callable() built-in in the standard library.
 
 - Issue #13273: fix a bug that prevented HTMLParser to properly detect some