From: Éric Araujo <merwok@netwok.org>
Date: Fri, 21 Oct 2011 13:52:10 +0000 (+0200)
Subject: Banch merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3764a964ca4e8c979743ba8c2f08b65ddf8b0070;p=python

Banch merge
---

3764a964ca4e8c979743ba8c2f08b65ddf8b0070
diff --cc Misc/NEWS
index 36aafd9fc2,8774334302..55b261ebed
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -505,7 -488,6 +505,7 @@@ Librar
    in os.kill().
  
  - Add support for unary plus and unary minus to collections.Counter().
-   Issue #13121: Also an support for inplace math operators.
++  Issue #13121: Also add support for inplace math operators.
  
  - Issue #12683: urlparse updated to include svn as schemes that uses relative
    paths. (svn from 1.5 onwards support relative path).