From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 7 Oct 2014 01:11:25 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~738
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b91ed56b9ba70b7c1aac6a4864db9fb5d18202bb;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

b91ed56b9ba70b7c1aac6a4864db9fb5d18202bb