From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 24 Jun 2014 03:16:06 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1425
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5c5175b47c150966456835ce5c05c6271330562;p=python

merge 3.4
---

f5c5175b47c150966456835ce5c05c6271330562