From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 2 Jul 2015 03:36:29 +0000 (-0500)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b3~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44f323cb42418e6e2b83b7655146de66a7289dd4;p=python

Merge 3.4
---

44f323cb42418e6e2b83b7655146de66a7289dd4