]> granicus.if.org Git - python/commitdiff
merge from 3.2
authorSenthil Kumaran <senthil@uthcode.com>
Mon, 4 Jul 2011 18:44:17 +0000 (11:44 -0700)
committerSenthil Kumaran <senthil@uthcode.com>
Mon, 4 Jul 2011 18:44:17 +0000 (11:44 -0700)
1  2 
Doc/library/datetime.rst
Doc/library/os.rst

Simple merge
Simple merge