From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 12 Mar 2015 09:32:20 +0000 (+0100)
Subject: Merge 3.4 (test_os)
X-Git-Tag: v3.5.0a3~198
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebaa81f3b1293a5936c72a0261af2a3ea46a3f27;p=python

Merge 3.4 (test_os)
---

ebaa81f3b1293a5936c72a0261af2a3ea46a3f27