From: Georg Brandl <georg@python.org>
Date: Thu, 6 Nov 2014 13:56:47 +0000 (+0100)
Subject: merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6a8a4f5f7e2ef0ca78622649d23acd984047613;p=python

merge heads
---

a6a8a4f5f7e2ef0ca78622649d23acd984047613