From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 13 Mar 2015 03:41:14 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a3~188
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38dae173d11c0f87cec46d137df9180e1f43d01c;p=python

merge 3.4
---

38dae173d11c0f87cec46d137df9180e1f43d01c