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

merge 3.4
---

0024fbb5ce336db4603fe56ab819538180192b05