]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with 3.3
authorGeorg Brandl <georg@python.org>
Sun, 6 Oct 2013 16:48:30 +0000 (18:48 +0200)
committerGeorg Brandl <georg@python.org>
Sun, 6 Oct 2013 16:48:30 +0000 (18:48 +0200)
1  2 
Doc/library/os.rst
Python/random.c

Simple merge
diff --cc Python/random.c
Simple merge