Merge commit 'origin/master'

2008-07-11 23:31:19 +02:00 · 2008-07-11 23:31:19 +02:00 · 2cc779b0a7
commit 2cc779b0a7
parent b955e4ea9d 5969582346
2 changed files with 2 additions and 1 deletions
--- a/icfp08/contact
+++ b/icfp08/contact
@ -1,2 +1,2 @@
-Johannes Reinhardt <Johannes.Reinhardt@gmx.de>
+Johannes Reinhardt <jreinhardt@ist-dein-freund.de>
 Stefan Bühler <icfp08@stbuehler.de>
--- a/icfp08/team
+++ b/icfp08/team
@ -0,0 +1 @@
 ORBIT
`@ -1,2 +1,2 @@`
	`Johannes Reinhardt <Johannes.Reinhardt@gmx.de>`	`Johannes Reinhardt <jreinhardt@ist-dein-freund.de>`
	`Stefan Bühler <icfp08@stbuehler.de>`	`Stefan Bühler <icfp08@stbuehler.de>`