From: Zachary Ware <zachary.ware@gmail.com>
Date: Sat, 29 Mar 2014 04:31:53 +0000 (-0500)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~2002
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=808676b43265601a9b5c9b0e8d39b1c827a445c4;p=python

Merge with 3.4
---

808676b43265601a9b5c9b0e8d39b1c827a445c4