From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 29 Sep 2014 23:12:44 +0000 (-0400)
Subject: merge 3.4
X-Git-Tag: v3.5.0a1~823
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdfb7691dd3aa4b1a868638a5654c4098b77d0d7;p=python

merge 3.4
---

cdfb7691dd3aa4b1a868638a5654c4098b77d0d7