[pypy-commit] extradoc extradoc: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r5513:c39e9226809e
Date: 2015-03-13 11:11 +0200
http://bitbucket.org/pypy/extradoc/changeset/c39e9226809e/

Log:	merge

diff --git a/blog/draft/stm-mar2015.txt b/blog/draft/stm-mar2015.txt
new file mode 100644
--- /dev/null
+++ b/blog/draft/stm-mar2015.txt
@@ -0,0 +1,10 @@
+=============
+Status of STM
+=============
+
+- stmgc-c7 reasonably good results, now porting to stmgc-c8
+
+- stmgc-c7 results (with download link), explain the new
+  features
+
+- stmgc-c8 in two words
diff --git a/sprintinfo/leysin-winter-2015/people.txt b/sprintinfo/leysin-winter-2015/people.txt
--- a/sprintinfo/leysin-winter-2015/people.txt
+++ b/sprintinfo/leysin-winter-2015/people.txt
@@ -17,7 +17,6 @@
 Manuel Jacob         21-28          Ermina
 Joan Massich         20-?           Ermina
 Quim Sanchez         20-?           Ermina
-Francisco Fernandez  20-28          Ermina
 Alexander Schremmer  21-23          Ermina
 ==================== ============== =======================
 
@@ -27,6 +26,7 @@
 ==================== ============== =====================
        Name          Arrive/Depart  Accomodation 
 ==================== ============== =====================
+Francisco Fernandez  no-show in     Leysin Winter 2015
 Romain Guillebert    ?              ?
 Christian Clauss     ?              ?
 Johan Råde           ?              ?