From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 15 Nov 2015 23:36:28 +0000 (+0100)
Subject: Add link to Fossetcon 2015.
X-Git-Url: http://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=0c272b8753cc541d519fede87a5096234fab671e;p=wiki

Add link to Fossetcon 2015.
---

diff --git a/activities.mdwn b/activities.mdwn
index 4218fbf..4332bcd 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
+
+* [Fossetcon](http://www.fossetcon.org/2015)
+   November 19-21, 2015, at Hilton Lake Buena Vista, United States.
+   There is a talk titled [Secure peer networking with tinc](http://www.fossetcon.org/2015/sessions/secure-peer-networking-tinc)
+   in Palm 4 from 10:15 to 11:00.
+
 ### Past events
 
 * [OHM2013](https://ohm2013.org/site/),