From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 15 Oct 2014 16:17:33 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.3rc1~465
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c422f3c3d0401aff0b2a5151181afcb508c928c;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

9c422f3c3d0401aff0b2a5151181afcb508c928c