X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=799c148ed01b5c9df5bdabf8f0395ede1660530a;hb=0b14e86eb1c716e622a04ee7539bac012b5822ff;hp=ec78d90d21f0d155457a03cf3ea97f7732b3f1ec;hpb=69648efbfa94e18988ba86a0dac9a5dfdeb0dbe1;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index ec78d90..799c148 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -10,8 +10,8 @@ not listed here, we would also like to hear about it.
 
 * [OHM2013](https://ohm2013.org/site/),
   July 31-August 4, 2013, near Alkmaar, The Netherlands.
-  There will be a lightning talk about tinc, and a workshop setting up VPNs with tinc at
-  the [Milliways village](https://ohm2013.org/wiki/Village:Milliways).
+  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