From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 20 Feb 2015 04:31:29 +0000 (-0600)
Subject: Null merge with 3.4
X-Git-Tag: v3.5.0a2~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=868a5a7bc65a4b76a8e7d5d0d60a158f3da27a89;p=python

Null merge with 3.4

(Typo was already fixed on this branch.)
---

868a5a7bc65a4b76a8e7d5d0d60a158f3da27a89