[pypy-commit] extradoc extradoc: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: extradoc
Changeset: r5776:b8a362c95c2d
Date: 2017-02-09 07:46 +0100
http://bitbucket.org/pypy/extradoc/changeset/b8a362c95c2d/

Log:	merge heads

diff --git a/sprintinfo/leysin-winter-2017/people.txt b/sprintinfo/leysin-winter-2017/people.txt
--- a/sprintinfo/leysin-winter-2017/people.txt
+++ b/sprintinfo/leysin-winter-2017/people.txt
@@ -11,6 +11,7 @@
 ==================== ============== =======================
 Armin Rigo                          private
 Richard Plangger     26.02/04.02    Ermina
+Remi Meier           (?)27.02/04.02 Ermina
 ==================== ============== =======================
 
 **NOTE:** lodging is by default in Ermina.  There are two ~4 people