From: Richard Oudkerk <shibturn@gmail.com>
Date: Mon, 24 Jun 2013 14:43:35 +0000 (+0100)
Subject: Issue #15818: Merge.
X-Git-Tag: v3.4.0a1~405
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71e7dbd11dbff8343b3f35faf896c16bce480a68;p=thirdparty%2FPython%2Fcpython.git

Issue #15818: Merge.
---

71e7dbd11dbff8343b3f35faf896c16bce480a68