From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 27 Sep 2015 09:05:12 +0000 (-0700)
Subject: merge 3.4
X-Git-Tag: v3.5.1rc1~264
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0daa86ce9791de963781f91e92ceb9aeb671909;p=python

merge 3.4
---

e0daa86ce9791de963781f91e92ceb9aeb671909