From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 29 Sep 2013 14:50:24 +0000 (-0400)
Subject: merge 3.3 (#19116)
X-Git-Tag: v3.4.0a4~311^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3dcdacfe6a698d955866bb3971c687aacc4dd892;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19116)
---

3dcdacfe6a698d955866bb3971c687aacc4dd892