From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 25 Mar 2015 01:30:01 +0000 (+0100)
Subject: Merge 3.4 (traceback)
X-Git-Tag: v3.5.0a3~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39183dfc682568e8a00203c26caee893f49ff390;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4 (traceback)
---

39183dfc682568e8a00203c26caee893f49ff390