Author: Romain Guillebert <romain...@gmail.com>
Branch: extradoc
Changeset: r5424:12b314a72e1f
Date: 2014-10-05 21:00 +0200
http://bitbucket.org/pypy/extradoc/changeset/12b314a72e1f/
Log: Merge heads
diff --git a/sprintinfo/warsaw-2014/announcement.txt
b/sprintinfo/warsaw-2014/announcement.txt
--- a/sprintinfo/warsaw-2014/announcement.txt
+++ b/sprintinfo/warsaw-2014/announcement.txt
@@ -38,8 +38,8 @@
------------
The sprint will happen within a room of Warsaw University. The
-address is Pasteura 5 (which is a form of "Pasteur street"), room 550.
-The person of contact is Maciej Fijalkowski.
+address is Pasteura 5 (which is a form of "Pasteur street"), dept. of
+Physics, room 450. The person of contact is Maciej Fijalkowski.
--------------
diff --git a/sprintinfo/warsaw-2014/people.txt
b/sprintinfo/warsaw-2014/people.txt
--- a/sprintinfo/warsaw-2014/people.txt
+++ b/sprintinfo/warsaw-2014/people.txt
@@ -9,7 +9,10 @@
==================== ============== =======================
Name Arrive/Depart Accomodation
==================== ============== =======================
-Armin Rigo 20/10-2X/10 with fijal?
+Armin Rigo 20/10-28/10 with fijal
+Maciej Fijalkowski 20/10-30/10 private
Romain Guillebert 19/10-26-10 ???
Manuel Jacob 20/10-26/10 ? (shared hotel room?)
+Kostia Lopuhin
+Antonio Cuni 20/10-26/10 ibis Reduta
http://www.ibis.com/gb/hotel-7125-ibis-warszawa-reduta/index.shtml
==================== ============== =======================
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
