From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 26 Jul 2013 07:35:10 +0000 (+0200)
Subject: Add times for tinc and ChaosVPN talks.
X-Git-Url: http://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=75c60f37436fcad69a3c5aeaf618c9d7078dc88e;p=wiki

Add times for tinc and ChaosVPN talks.
---

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