Add Chaos Communication Camp 2011 to the list of activities.

[wiki] / activities.mdwn

diff --git a/activities.mdwn b/activities.mdwn
index 14e6f38..142013f 100644 (file)
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -7,13 +7,20 @@ 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)".
+* [Chaos Communication Camp](http://events.ccc.de/camp/2011/),
+  August 10-14, 2011, in Finowfurt, Germany.
+  We are present in the [Milliways village](http://events.ccc.de/camp/2011/wiki/Milliways).
 
 ### Past events
 
+* [FOSDEM](http://fosdem.org/2011/),
+  February 5 and 6, 2011, in Brussels, Belgium.
+  We were present as part of the devroom [New challenges in Virtualization](http://nciv2011.v2.cs.unibo.it/).
+* [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.