From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 22 Dec 2013 00:48:06 +0000 (+0100)
Subject: Null merge (#12226 already fixed on default)
X-Git-Tag: v3.4.0b2~133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cfc2aefecd4ae0e837b912c28b7fe2cb5d91460;p=thirdparty%2FPython%2Fcpython.git

Null merge (#12226 already fixed on default)
---

3cfc2aefecd4ae0e837b912c28b7fe2cb5d91460