From: Senthil Kumaran <senthil@uthcode.com>
Date: Wed, 9 Apr 2014 15:45:14 +0000 (-0400)
Subject: merge from 3.4
X-Git-Tag: v3.5.0a1~1919
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db599886de8f6cad3d752e540ce40603f47703ad;p=thirdparty%2FPython%2Fcpython.git

merge from 3.4
---

db599886de8f6cad3d752e540ce40603f47703ad
diff --cc Doc/README.txt
index f4f6d81bc9ad,8e0241096b45..cb57e617e5d8
--- a/Doc/README.txt
+++ b/Doc/README.txt
@@@ -3,7 -3,7 +3,7 @@@ Python Documentation READM
  
  This directory contains the reStructuredText (reST) sources to the Python
  documentation.  You don't need to build them yourself, prebuilt versions are
- available at <http://docs.python.org/download/>.
 -available at <https://docs.python.org/3.4/download.html>.
++available at <https://docs.python.org/dev/download.html>.
  
  Documentation on the authoring Python documentation, including information about
  both style and markup, is available in the "Documenting Python" chapter of the