merge from 3.2

8fbfc12f · Senthil Kumaran · 276a58b8 · 3aac1794 · 8fbfc12f · 8fbfc12f
Commit 8fbfc12f authored Jul 04, 2011 by Senthil Kumaran
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Doc/library/datetime.rst Doc/library/datetime.rst +1 -1

Doc/library/os.rst Doc/library/os.rst +1 -1

No files found.
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst