From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 3 Oct 2014 22:17:30 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~770
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91b62c4a8a87100094b4167d2319e85159b6f4a5;p=python

merge 3.4
---

91b62c4a8a87100094b4167d2319e85159b6f4a5