From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 24 Jun 2011 20:59:40 +0000 (+0200)
Subject: Add Chaos Communication Camp 2011 to the list of activities.
X-Git-Url: http://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=91e652ecf81c1be503a859baa330914c21e3ed35;p=wiki

Add Chaos Communication Camp 2011 to the list of activities.
---

diff --git a/activities.mdwn b/activities.mdwn
index 9d8118e..142013f 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,6 +5,12 @@ 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
+
+* [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/),