From 104ef03ec9de4c40259d374177cb9203febe6c41 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 18 Jun 2012 00:19:15 +0200
Subject: [PATCH] events: Trollcon

---
 content/events.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/content/events.xml b/content/events.xml
index 0810d3eef..60247b936 100644
--- a/content/events.xml
+++ b/content/events.xml
@@ -1131,4 +1131,10 @@
     <end>2012-07-08T23:59:59</end>
     <link>http://spawnfest.com/</link>
   </event>
+  <event title="Trollcon">
+    <start>2012-10-20</start>
+    <end>2012-10-21</end>
+    <linK>http://trollcon.de/</linK>
+    <location>RaumZeitLabor, Mannheim</location>
+  </event>
 </calendar>