X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=30a96dcff6fd1f7742fa252485bd8c5ea5d91a86;hb=9accc18e156bbadc388f54b8f46caf9b8ae7bd5a;hp=14e6f3815b2661a595ee73f797018a4729feb09c;hpb=53565d11c069a0db503a7968e87b08bb6bf70f19;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index 14e6f38..30a96dc 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,15 +5,18 @@ you are holding a meeting or writing an article about VPNs and also
 mention tinc, please [[tell us|contact]]. If you know of any we have
 not listed here, we would also like to hear about it.
 
-### Upcoming events
-
-* [FOSDEM](http://fosdem.org/2010/),
-  February 6, 2010, at 15:20 CET.
-  At this event, I will give a lightning talk titled
-  "[http://fosdem.org/2010/schedule/events/tinc](tinc: the difficulties of a peer-to-peer VPN on the hostile Internet)".
+* [FOSDEM](http://fosdem.org/2011/),
+  February 5 and 6, 2011, in Brussels, Belgium.
+  We will be present as part of the devroom [New challenges in Virtualization](http://nciv2011.v2.cs.unibo.it/).
+  You are welcome to come by and discuss tinc, VPNs and other virtualization issues here.
 
 ### Past events
 
+* [FOSDEM](http://fosdem.org/2010/),
+  February 6, 2010, at 15:20 CET.
+  At this event, Guus Sliepen gave a lightning talk titled
+  ["tinc: the difficulties of a peer-to-peer VPN on the hostile Internet"](http://fosdem.org/2010/schedule/events/tinc).
+  You can look at the [slides](/presentations/fosdem-2010/tinc_fosdem2010_slides.pdf).
 * [Online tutorial](),
   November 8, 2003,
   on [irc.debian.org #tinc]() at 18:00 GMT.