From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 17 Mar 2014 21:20:50 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~2100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7483993fea2862f750526cbb94a4a32f6dfad9c;p=python

merge 3.4
---

d7483993fea2862f750526cbb94a4a32f6dfad9c