]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Wed, 11 Jan 2012 23:17:40 +0000 (18:17 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 11 Jan 2012 23:17:40 +0000 (18:17 -0500)
1  2 
Doc/library/stdtypes.rst

Simple merge