From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 26 May 2014 22:45:22 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~1587
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2059ded1af321241321002be6a8de011498e4afe;p=python

merge 3.4
---

2059ded1af321241321002be6a8de011498e4afe