From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 24 Sep 2015 07:04:44 +0000 (+0200)
Subject: Merge 3.5 (codecs, issue #24894)
X-Git-Tag: v3.6.0a1~1453
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63c8907498c2a1e9fccf32e2cfd0f8e9a5896f53;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5 (codecs, issue #24894)
---

63c8907498c2a1e9fccf32e2cfd0f8e9a5896f53