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

[benjamin.peterson]

https://hg.python.org/cpython/rev/2ca5a37f996f
changeset:   95945:2ca5a37f996f
parent:      95935:f7cc54086cd2
parent:      95943:8eddc3c169df
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun May 10 21:19:56 2015 -0400
summary:
  merge 3.4

files:
  Misc/python.man |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Misc/python.man b/Misc/python.man
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -431,7 +431,7 @@
 The integer must be a decimal number in the range [0,4294967295].  Specifying
 the value 0 will disable hash randomization.
 .SH AUTHOR
-The Python Software Foundation: https://www.python.org/psf
+The Python Software Foundation: https://www.python.org/psf/
 .SH INTERNET RESOURCES
 Main website:  https://www.python.org/
 .br

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