From: Zachary Ware <zachary.ware@gmail.com>
Date: Sun, 8 Jun 2014 19:43:08 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~1488
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c6f189964a5e6875d59b519fad941c43c124103;p=python

Merge with 3.4
---

8c6f189964a5e6875d59b519fad941c43c124103