From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 23 Nov 2013 20:06:21 +0000 (+0100)
Subject: Merge
X-Git-Tag: v3.4.0b1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6188d09f1c27f0ba5d4c369677a308fe118e9d5a;p=python

Merge
---

6188d09f1c27f0ba5d4c369677a308fe118e9d5a