From: Christian Heimes <christian@python.org>
Date: Thu, 16 Apr 2015 18:26:19 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.5.0a4~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6297fecbd1fc534176d65a6a27c01b4667a6b417;p=python

Merge
---

6297fecbd1fc534176d65a6a27c01b4667a6b417