X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=4218fbfe804c32ae4a4c8d12b77d7533f8858ffe;hb=472fd07a588fc9f85a0a9c13ea14af5699349fc4;hp=e75f1f88c2bca9bed45101b6d57bf4d12b69f524;hpb=5d16c4058d5e939f39e8ca03e92b97f80a4ba392;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index e75f1f8..4218fbf 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,18 +5,16 @@ 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
+### Past events
 
 * [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).
-
-### Past events
+  There was a lightning talk about tinc ([slides](/presentations/OHM2013/The_tinc_VPN.pdf)) 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).
 
 * [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).
+  We were present in the [Milliways village](http://events.ccc.de/camp/2011/wiki/Milliways).
 * [FOSDEM](https://archive.fosdem.org/2011/),
   February 5 and 6, 2011, in Brussels, Belgium.
   We were present as part of the devroom "New challenges in Virtualization".