[pypy-commit] extradoc extradoc: merged upstream.

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: extradoc
Changeset: r3598:50985db214ed
Date: 2011-06-06 10:31 +0200
http://bitbucket.org/pypy/extradoc/changeset/50985db214ed/

Log:	merged upstream.

diff --git a/sprintinfo/genova-pegli-2011/people.txt b/sprintinfo/genova-pegli-2011/people.txt
--- a/sprintinfo/genova-pegli-2011/people.txt
+++ b/sprintinfo/genova-pegli-2011/people.txt
@@ -14,7 +14,7 @@
 Laura Creighton      26/6 - 2/7          double room w Jacob
 Jacob Hallen         26/6 - 2/7          double room w Laura
 Armin Rigo           26/6 - 3/7          room to share, anyone?
-Romain Guillebert    Depending on trains willing to share
+Romain Guillebert    26/6 - 3/7          willing to share
 Dario Bertini        26/6 - 2 or 3/7     ?
 Christian Tismer     26/6 - 3/7          room to share, anyone?
 ==================== =================== =======================