From: Georg Brandl <georg@python.org>
Date: Thu, 2 Oct 2014 06:39:42 +0000 (+0200)
Subject: merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc14bc58e3ebeb43e51dab11bb5b239c778d680a;p=python

merge heads
---

dc14bc58e3ebeb43e51dab11bb5b239c778d680a