From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 7 May 2015 22:42:16 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.5.0b1~229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95283fb58951aaa0ee7cfefcbf8785f132819529;p=python

Merge 3.4
---

95283fb58951aaa0ee7cfefcbf8785f132819529