From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 12 Dec 2014 14:56:54 +0000 (-0500)
Subject: merge 3.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ac7cbb2530477e709117bac2f1c09a11f1ba540;p=python

merge 3.4
---

8ac7cbb2530477e709117bac2f1c09a11f1ba540