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

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

0ec69a6a41387cda8eb52a1da1df4bc2e5311152