From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sun, 23 Oct 2011 20:44:19 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1083^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9126b5e3b087173a5c5348246a806fcb193bc9b;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

e9126b5e3b087173a5c5348246a806fcb193bc9b
diff --cc Misc/NEWS
index e6ee12006daa,100fcecf8da3..be4a27c2d731
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1678,6 -1100,6 +1678,8 @@@ C-AP
  Documentation
  -------------
  
++- Issue #13141: Demonstrate recommended style for socketserver examples.
++
  - Issue #11818: Fix tempfile examples for Python 3.