From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 24 Nov 2014 02:38:13 +0000 (-0600)
Subject: merge 3.4 (#22788)
X-Git-Tag: v3.5.0a1~447
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c22e65773c94ff810bd7adbb43c2b52e269598a;p=thirdparty%2FPython%2Fcpython.git

merge 3.4 (#22788)
---

6c22e65773c94ff810bd7adbb43c2b52e269598a