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 | |
| parent | 331d4b2fdb828de6d1b50ec866fa1839a429ca5c (diff) | |
| parent | f910e7b3b241e67172fe1098b395d67ea360fbc6 (diff) | |
Merge remote branch 'flubber/master'
Conflicts:
news/2009-12-31.mdwn
| -rw-r--r-- | community/meetings/fosdem_2010.mdwn | 8 | ||||
| -rw-r--r-- | news/2009-12-31.mdwn | 2 |
2 files changed, 5 insertions, 5 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","","","" """]] --- diff --git a/news/2009-12-31.mdwn b/news/2009-12-31.mdwn index e3b3a3dd..5c3b4f00 100644 --- a/news/2009-12-31.mdwn +++ b/news/2009-12-31.mdwn @@ -53,7 +53,7 @@ else="[[!paste id=full_news]]"]] > directly via the [[Debian GNU/Hurd|hurd/running/debian]] distribution. > Thanks to their and other porters' relentless work, the percentage of > available Debian packages [has reached -> 65%](http://buildd.debian-ports.org/stats/), rising. For a specific example, +> 66%](http://buildd.debian.org/stats/), rising. For a specific example, > they ported many GNOME packages, so that the `gnome-core` metapackage [is > installable > again](http://lists.gnu.org/archive/html/bug-hurd/2009-12/msg00217.html). |