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

[berker.peksag]

https://hg.python.org/cpython/rev/bf9f39e5d672
changeset:   102534:bf9f39e5d672
parent:      102532:f8d502ef21d9
parent:      102533:999065975bda
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Thu Aug 04 17:26:00 2016 +0300
summary:
  Merge from 3.5

files:
  Doc/library/ipaddress.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/ipaddress.rst b/Doc/library/ipaddress.rst
--- a/Doc/library/ipaddress.rst
+++ b/Doc/library/ipaddress.rst
@@ -156,7 +156,7 @@
       This is the name that could be used for performing a PTR lookup, not the
       resolved hostname itself.
 
-   .. versionadded:: 3.5
+      .. versionadded:: 3.5
 
    .. attribute:: is_multicast
 

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