diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2009-12-31 14:57:01 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2009-12-31 14:57:01 +0100 |
| commit | 70fab0170efc58cb81a317a9eee1d74751b6cf90 (patch) | |
| tree | 7170b3ac70e60b3ec758a6daa3efcfaf57ce0c53 /community/meetings/fosdem_2010.mdwn | |
| parent | 331d4b2fdb828de6d1b50ec866fa1839a429ca5c (diff) | |
| parent | f910e7b3b241e67172fe1098b395d67ea360fbc6 (diff) | |
Merge remote branch 'flubber/master'
Conflicts:
news/2009-12-31.mdwn
Diffstat (limited to 'community/meetings/fosdem_2010.mdwn')
| -rw-r--r-- | community/meetings/fosdem_2010.mdwn | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/community/meetings/fosdem_2010.mdwn b/community/meetings/fosdem_2010.mdwn index 0cd882a9..55675dec 100644 --- a/community/meetings/fosdem_2010.mdwn +++ b/community/meetings/fosdem_2010.mdwn @@ -24,7 +24,7 @@ Bruxelles. "Andrei Barbu","?","","","" "Arne Babenhauserheide","?","","","" "[[Bas Wijnen|baswijnen]]","?","","","" -"Carl Fredrik Hammar","?","","","" +"Carl Fredrik Hammar","considering","","","" "Colin Leitner","?","","","" "Emilio Pozuelo Monfort","?","","","" "Flavio Cruz","?","","","" @@ -32,16 +32,16 @@ Bruxelles. "Guillem Jover","?","","","" "Madhusudan C.S.","?","","","" "Marcus Brinkmann","?","","","" -"[[Michael Banck|MichaelBanck]]","?","","","" +"[[Michael Banck|MichaelBanck]]","yes","","","" "Neal Walfield","plans to go","","","" -"Olaf Buddenhagen","?","","","" +"Olaf Buddenhagen","yes","fr","mo","yes" "Pino Toscano","?","","","" "[[Samuel Thibault|SamuelThibault]]","?","","","" "Sergiu Ivanov","no","n/a","n/a","n/a" "[[Soeren Schulze|SoerenSchulze]]","?","","","" "[[Stefan Siegl|stesie]]","?","","","" "[[Thomas Schwinge|tschwinge]]","plans to go","","","" -"Zheng Da","?","","","" +"Zheng Da","no","","","" """]] --- |