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

diff --git a/activities.mdwn b/activities.mdwn
index e75f1f8..799c148 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -10,7 +10,9 @@ 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.
-  We are present in 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