From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 6 Jul 2015 16:28:40 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0b4~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dd6e477df5b75d0fae16431a63f3493f72d3459;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

2dd6e477df5b75d0fae16431a63f3493f72d3459