diff options
| author | Arne Babenhauserheide <arne_bab@web.de> | 2010-07-09 11:14:46 +0200 |
|---|---|---|
| committer | Arne Babenhauserheide <arne_bab@web.de> | 2010-07-09 11:14:46 +0200 |
| commit | cc236d8341b121206d65dc399d5bbbe51360da4a (patch) | |
| tree | 8da1c729421dbb44b63c3bc7d7f30082e0a8ff35 | |
| parent | f35c31318e1c99df211e3c24c4132abbe7c775e1 (diff) | |
| parent | 476d61169db3183b5696385ebd0c68a247592a2e (diff) | |
Merge branch 'master' of flubber:~hurd-web/hurd-web
| -rw-r--r-- | community.mdwn | 8 | ||||
| -rw-r--r-- | community/meetings.mdwn | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/community.mdwn b/community.mdwn index 658b604e..101e15a8 100644 --- a/community.mdwn +++ b/community.mdwn @@ -48,11 +48,3 @@ Further ways of getting in contact or getting information: * [Hurdfr.org](http://www.hurdfr.org/) * [HurdIt](http://hurd-it.sf.net/) * [HurdUk](http://uwhug.org.uk/) -* [HurdUs](http://hurd.gnufans.org/) - ---- - -# Other Community Pages - - * [GNU Hurd Sverige](http://leochingkwake.se/gnuhurd/) -- A Swedish website - about the GNU Hurd diff --git a/community/meetings.mdwn b/community/meetings.mdwn index 84a2c1a2..c7ed664d 100644 --- a/community/meetings.mdwn +++ b/community/meetings.mdwn @@ -1,4 +1,4 @@ -[[!meta copyright="Copyright © 2007, 2008, 2009 Free Software Foundation, +[[!meta copyright="Copyright © 2007, 2008, 2009, 2010 Free Software Foundation, Inc."]] [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable @@ -13,11 +13,11 @@ is included in the section entitled # Upcoming - * [[FOSDEM 2010]] * [[Self-organised]] # Past + * [[FOSDEM 2010]] * [[EuroSys_2009]] * [[FOSDEM_2008]] * [[Weekend_at_stesie's|stesie_2007-10-12]] |