[pypy-commit] extradoc extradoc: merge heads

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: extradoc
Changeset: r4860:7274e147df46
Date: 2012-10-16 16:46 +0200
http://bitbucket.org/pypy/extradoc/changeset/7274e147df46/

Log:	merge heads

diff --git a/blog/draft/py3k-status-update-6.rst b/blog/draft/py3k-status-update-6.rst
--- a/blog/draft/py3k-status-update-6.rst
+++ b/blog/draft/py3k-status-update-6.rst
@@ -58,7 +58,7 @@
 Finally, I would like to thank Amaury Forgeot d'Arc and Ariel Ben-Yehuda for
 their work on the branch; among other things, Amaury recently worked on
 ``cpyext`` and on the PyPy ``_cffi_backend``, while Ariel submitted a patch to
-implement `PEP 3138`.
+implement `PEP 3138`_.
 
 .. _donated: http://morepypy.blogspot.com/2012/01/py3k-and-numpy-first-stage-thanks-to.html
 .. _`py3k proposal`: http://pypy.org/py3donate.html