From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 26 Dec 2014 17:07:39 +0000 (-0600)
Subject: null merge 3.4
X-Git-Tag: v3.5.0a1~272
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42cc0b711ec6f100edaa37dce8e6be5172418abb;p=python

null merge 3.4
---

42cc0b711ec6f100edaa37dce8e6be5172418abb