]> granicus.if.org Git - python/commitdiff
merge with 3.2
authorGeorg Brandl <georg@python.org>
Tue, 14 Aug 2012 07:40:26 +0000 (09:40 +0200)
committerGeorg Brandl <georg@python.org>
Tue, 14 Aug 2012 07:40:26 +0000 (09:40 +0200)
1  2 
Doc/library/functions.rst
Doc/library/io.rst

Simple merge
Simple merge