From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Feb 2015 01:18:29 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad9f99e41fb7d7e51c8424bb3adba6ad555d0451;p=python

merge 3.4
---

ad9f99e41fb7d7e51c8424bb3adba6ad555d0451