X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=799c148ed01b5c9df5bdabf8f0395ede1660530a;hb=75c60f37436fcad69a3c5aeaf618c9d7078dc88e;hp=b8a24514409dc36bb2e6743e32bd8ff0e2222bce;hpb=c09153a5a99013fcf79dceaee4e697958b76be94;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index b8a2451..799c148 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,6 +5,15 @@ 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
+
+* [OHM2013](https://ohm2013.org/site/),
+  July 31-August 4, 2013, near Alkmaar, The Netherlands.
+  There will be a lightning talk about tinc in T2 at 15:55 on August 1, a talk about [ChaosVPN](http://wiki.hamburg.ccc.de/index.php/ChaosVPN) in T6 at 13:00 on August 1,
+  and combined workshop for tinc and ChaosVPN at the [Milliways village](https://ohm2013.org/wiki/Village:Milliways).
+
+
 ### Past events
 
 * [Chaos Communication Camp](http://events.ccc.de/camp/2011/),