From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 18 Feb 2015 13:55:38 +0000 (-0500)
Subject: merge 3.3
X-Git-Tag: v3.5.0a2~123^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76e37b1b8aa063e134249a6e62d569d48124736c;p=python

merge 3.3
---

76e37b1b8aa063e134249a6e62d569d48124736c
diff --cc Misc/README
index e7780a2f31,c1e890f8c0..ddb8f3f975
--- a/Misc/README
+++ b/Misc/README
@@@ -21,8 -21,9 +21,7 @@@ README                  The file you'r
  README.AIX              Information about using Python on AIX
  README.coverity         Information about running Coverity's Prevent on Python
  README.valgrind         Information for Valgrind users, see valgrind-python.supp
- RPM                     (Old) tools to build RPMs
 -svnmap.txt              Map of old SVN revs and branches to hg changeset ids
  SpecialBuilds.txt       Describes extra symbols you can set for debug builds
 -TextMate                A TextMate bundle for Python development
 +svnmap.txt              Map of old SVN revs and branches to hg changeset ids
  valgrind-python.supp    Valgrind suppression file, see README.valgrind
  vgrindefs               Python configuration for vgrind (a generic pretty printer)
 -Vim                     Python development utilities for the Vim editor