[Python-checkins] cpython (merge default -> default): Merge

[antoine.pitrou]

http://hg.python.org/cpython/rev/d99a118f0749
changeset:   77747:d99a118f0749
parent:      77746:85d827cbabfa
parent:      77745:dd625681000a
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Sun Jun 24 22:22:07 2012 +0200
summary:
  Merge

files:
  Doc/library/datetime.rst |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -913,8 +913,8 @@
 
    .. versionchanged:: 3.3
 
-   Equality comparisons between naive and aware :class:`datetime`
-   instances don't raise :exc:`TypeError`.
+      Equality comparisons between naive and aware :class:`datetime`
+      instances don't raise :exc:`TypeError`.
 
    .. note::
 
@@ -1344,8 +1344,8 @@
 
   .. versionchanged:: 3.3
 
-  Equality comparisons between naive and aware :class:`time` instances
-  don't raise :exc:`TypeError`.
+     Equality comparisons between naive and aware :class:`time` instances
+     don't raise :exc:`TypeError`.
 
 * hash, use as dict key
 

-- 
Repository URL: http://hg.python.org/cpython