From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 10 Mar 2015 12:31:58 +0000 (+0100)
Subject: Merge 3.4 (os doc)
X-Git-Tag: v3.5.0a3~213
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80f6bb4cd85c88fc24a4d183c7c236f97ac3eb2f;p=thirdparty%2FPython%2Fcpython.git

Merge 3.4 (os doc)
---

80f6bb4cd85c88fc24a4d183c7c236f97ac3eb2f