From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 5 Jul 2015 03:53:37 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.6.0a1~2003^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a111271ba7303dff9d52badfb5554807ea7d9f56;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

a111271ba7303dff9d52badfb5554807ea7d9f56