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

merge 3.4
---

c0a446a7d9d44ee50ece960cbb5e81e72a9e5d33