From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 29 Sep 2014 23:09:49 +0000 (-0400)
Subject: merge 3.3 (closes #22519)
X-Git-Tag: v3.4.3rc1~600
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18f836fb658a5a545e8f9e3c72751759836322f8;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (closes #22519)
---

18f836fb658a5a545e8f9e3c72751759836322f8