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

[benjamin.peterson]

http://hg.python.org/cpython/rev/976915e35ccd
changeset:   70826:976915e35ccd
parent:      70821:fd6446a88fe3
parent:      70825:4d465cef3257
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Jun 16 18:50:21 2011 -0500
summary:
  merge 3.2

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


diff --git a/Doc/library/crypto.rst b/Doc/library/crypto.rst
--- a/Doc/library/crypto.rst
+++ b/Doc/library/crypto.rst
@@ -25,5 +25,5 @@
 A.M. Kuchling of further interest; the package contains modules for various
 encryption algorithms, most notably AES.  These modules are not distributed with
 Python but available separately.  See the URL
-http://www.amk.ca/python/code/crypto.html  for more information.
+http://www.pycrypto.org  for more information.
 

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