From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 27 Jan 2014 03:58:42 +0000 (-0500)
Subject: merge 3.3 (closes #12704)
X-Git-Tag: v3.4.0rc1~229^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71215c584ad94cdfe34cfa5ab522f7c36f2df0c7;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (closes #12704)
---

71215c584ad94cdfe34cfa5ab522f7c36f2df0c7