From: Christian Heimes <christian@cheimes.de>
Date: Sat, 19 Oct 2013 17:56:27 +0000 (+0200)
Subject: merge
X-Git-Tag: v2.7.6rc1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6698564eddc894772af405d3643e133dbfd5d839;p=python

merge
---

6698564eddc894772af405d3643e133dbfd5d839