From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 1 Mar 2014 07:03:57 +0000 (-0500)
Subject: merge 3.2
X-Git-Tag: v3.3.5rc2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f8e4c203b83b676aaaaae414174454629a2cf9a;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

4f8e4c203b83b676aaaaae414174454629a2cf9a