[pypy-commit] extradoc extradoc: Put back changes from c0e8633624c9 that were accidentally clobbered by d821325a6875.

[hodgestar]

Author: Simon Cross <hodgestar at gmail.com>
Branch: extradoc
Changeset: r4745:632b1abb75b5
Date: 2012-09-05 19:56 +0200
http://bitbucket.org/pypy/extradoc/changeset/632b1abb75b5/

Log:	Put back changes from c0e8633624c9 that were accidentally clobbered
	by d821325a6875.

diff --git a/sprintinfo/cape-town-2012/announce.txt b/sprintinfo/cape-town-2012/announce.txt
--- a/sprintinfo/cape-town-2012/announce.txt
+++ b/sprintinfo/cape-town-2012/announce.txt
@@ -18,6 +18,10 @@
 
 * running your software on PyPy
 
+* work on PyPy's numpy (status__)
+
+* work on STM (status__)
+
 * JIT improvements
 
 * any exciting stuff you can think of
@@ -25,6 +29,10 @@
 If there are newcomers, we'll run the usual introduction to hacking on
 PyPy.
 
+.. __: http://morepypy.blogspot.ch/2012/09/numpy-on-pypy-status-update.html
+.. __: http://mail.python.org/pipermail/pypy-dev/2012-September/010513.html
+
+
 Location
 --------
 
@@ -53,6 +61,7 @@
 The power plug is some weird derivative of an old-english standard,
 but adapters are easily acquired.
 
+
 Who's Coming?
 -------------