diff options
| author | Arne Babenhauserheide <arne_bab@web.de> | 2011-12-19 06:28:18 +0100 |
|---|---|---|
| committer | Arne Babenhauserheide <arne_bab@web.de> | 2011-12-19 06:28:18 +0100 |
| commit | 83a6603ed188d746e2871decf85939fb7975b979 (patch) | |
| tree | 5f671db8fa7e3828322a4d4b1b9cdce9b4bb6ac4 /community/meetings.mdwn | |
| parent | d8b7944e910af3fdc1109846698d67738761f85a (diff) | |
| parent | 6c057cff39ff782e9155c07eee44884cd9c48c9c (diff) | |
Merge branch 'master' of flubber:~hurd-web/hurd-web
Diffstat (limited to 'community/meetings.mdwn')
| -rw-r--r-- | community/meetings.mdwn | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn index 6c15d144..4ae52a1a 100644 --- a/community/meetings.mdwn +++ b/community/meetings.mdwn @@ -13,15 +13,17 @@ License|/fdl]]."]]"""]] # Upcoming - * [[GNU Hackers Meeting, 2011, Paris|ghm2011]] ## In the Future + * [[FOSDEM_2012]] * [[Self-organised]] # Past + * [[FrOSCon_2011]] + * [[GNU Hackers Meeting, 2011, Paris|ghm2011]] * [[FOSDEM_2011]] * [[DebConf10]] * [[GNU Hackers Meeting, 2010, Den Haag|ghm2010]] |