From 69648efbfa94e18988ba86a0dac9a5dfdeb0dbe1 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 28 Jun 2013 13:40:11 +0200
Subject: [PATCH] Add news item about OHM2013.

---
 activities.mdwn   | 4 +++-
 news/ohm2013.mdwn | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 news/ohm2013.mdwn

diff --git a/activities.mdwn b/activities.mdwn
index e75f1f8..ec78d90 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, and a workshop setting up VPNs with tinc at
+  the [Milliways village](https://ohm2013.org/wiki/Village:Milliways).
+
 
 ### Past events
 
diff --git a/news/ohm2013.mdwn b/news/ohm2013.mdwn
new file mode 100644
index 0000000..97b0eda
--- /dev/null
+++ b/news/ohm2013.mdwn
@@ -0,0 +1,6 @@
+[[!meta author="guus"]]
+
+<img src="https://ohm2013.org/site/wp-content/uploads/2012/12/ohm2013-rect-date-520px.png" width="260" height="164" alt="OHM2013">
+
+At [OHM2013](https://ohm2013.org/site/), there will be a lightning talk about tinc,
+and a workshop setting up VPNs using tinc at the Milliways village.
-- 
2.20.1