[pypy-commit] extradoc extradoc: Merge heads

[rguillebert]

Author: Romain Guillebert <romain.py at gmail.com>
Branch: extradoc
Changeset: r4004:9601f2597df0
Date: 2012-01-07 18:27 +0100
http://bitbucket.org/pypy/extradoc/changeset/9601f2597df0/

Log:	Merge heads

diff --git a/sprintinfo/leysin-winter-2012/people.txt b/sprintinfo/leysin-winter-2012/people.txt
--- a/sprintinfo/leysin-winter-2012/people.txt
+++ b/sprintinfo/leysin-winter-2012/people.txt
@@ -12,6 +12,7 @@
 ==================== ============== =======================
 Armin Rigo                          private
 David Schneider      17/22          ermina
+Antonio Cuni         16/22          ermina, might arrive on the 15th
 Romain Guillebert    15/22          ermina
 ==================== ============== =======================