]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.2
authorBenjamin Peterson <benjamin@python.org>
Fri, 20 May 2011 16:49:58 +0000 (11:49 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 20 May 2011 16:49:58 +0000 (11:49 -0500)
1  2 
Doc/library/os.rst

Simple merge