From: Guus Sliepen Date: Mon, 11 Jan 2010 13:10:29 +0000 (+0100) Subject: Add link to lightning talk information on the FOSDEM website. X-Git-Url: http://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=53565d11c069a0db503a7968e87b08bb6bf70f19;p=wiki Add link to lightning talk information on the FOSDEM website. --- diff --git a/activities.mdwn b/activities.mdwn index ba5134b..14e6f38 100644 --- a/activities.mdwn +++ b/activities.mdwn @@ -5,6 +5,13 @@ 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 + +* [FOSDEM](http://fosdem.org/2010/), + February 6, 2010, at 15:20 CET. + At this event, I will give a lightning talk titled + "[http://fosdem.org/2010/schedule/events/tinc](tinc: the difficulties of a peer-to-peer VPN on the hostile Internet)". + ### Past events * [Online tutorial](), diff --git a/news/fosdem-2010.mdwn b/news/fosdem-2010.mdwn index 578c714..aa0f01e 100644 --- a/news/fosdem-2010.mdwn +++ b/news/fosdem-2010.mdwn @@ -1,6 +1,5 @@ [[!meta author="guus"]] At [FOSDEM 2010](http://fosdem.org/2010/), I will give a lightning talk titled -"tinc: the difficulties of a peer-to-peer VPN on the hostile Internet". The -talk will probably be on Saturday 7th of Februari at 15:20 CET, but this might -still change. +"[http://fosdem.org/2010/schedule/events/tinc](tinc: the difficulties of a peer-to-peer VPN on the hostile Internet)". The +talk will be on Saturday 7th of Februari at 15:20 CET.