From: Georg Brandl <georg@python.org>
Date: Sun, 9 Mar 2014 09:23:24 +0000 (+0100)
Subject: merge
X-Git-Tag: v2.7.7rc1~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bca761ae86af1c70edbd3d92800bc3518bce19e;p=python

merge
---

3bca761ae86af1c70edbd3d92800bc3518bce19e