From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 Dec 2013 01:45:53 +0000 (-0600)
Subject: merge 3.3 (#19563)
X-Git-Tag: v3.4.0b2~126
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fb007f3299039f27937ef72c073192a76f29743;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#19563)
---

8fb007f3299039f27937ef72c073192a76f29743