From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 13 Mar 2015 21:21:29 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a3~179
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76c95a01dceb538b350de8ae70c3690cf0ca7d61;p=python

merge 3.4
---

76c95a01dceb538b350de8ae70c3690cf0ca7d61