From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 23 Apr 2014 01:55:07 +0000 (-0400)
Subject: merge 3.4 (#21330)
X-Git-Tag: v3.5.0a1~1808
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0c597f5ffcb696a394c5901fec0e489f854ae12;p=python

merge 3.4 (#21330)
---

b0c597f5ffcb696a394c5901fec0e489f854ae12