]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#11985: merge with 3.1.
authorEzio Melotti <ezio.melotti@gmail.com>
Wed, 4 May 2011 15:39:29 +0000 (18:39 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Wed, 4 May 2011 15:39:29 +0000 (18:39 +0300)
1  2 
Lib/platform.py

diff --cc Lib/platform.py
Simple merge