summaryrefslogtreecommitdiff
path: root/community/meetings.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'community/meetings.mdwn')
-rw-r--r--community/meetings.mdwn13
1 files changed, 9 insertions, 4 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn
index 939d5269..6c15d144 100644
--- a/community/meetings.mdwn
+++ b/community/meetings.mdwn
@@ -1,5 +1,5 @@
-[[!meta copyright="Copyright © 2007, 2008, 2009, 2010 Free Software Foundation,
-Inc."]]
+[[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011 Free Software
+Foundation, Inc."]]
[[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable
id="license" text="Permission is granted to copy, distribute and/or modify this
@@ -13,13 +13,18 @@ License|/fdl]]."]]"""]]
# Upcoming
- * [[FOSDEM_2011]]
+ * [[GNU Hackers Meeting, 2011, Paris|ghm2011]]
+
+## In the Future
+
* [[Self-organised]]
+
# Past
+ * [[FOSDEM_2011]]
* [[DebConf10]]
- * [[GNU Hackers Meeting in the Hague 2010|ghm2010]]
+ * [[GNU Hackers Meeting, 2010, Den Haag|ghm2010]]
* [[FOSDEM_2010]]
* [[EuroSys_2009]]
* [[FOSDEM_2008]]