From bea5d5ae4d7d8213a01b71473f0c36e677c9d713 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 25 Jul 2010 17:15:32 +0200
Subject: [PATCH] events: LHC, nodeknockout

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

diff --git a/content/events.xml b/content/events.xml
index e18c00070..e4a9b7417 100644
--- a/content/events.xml
+++ b/content/events.xml
@@ -681,4 +681,15 @@
     <location>Kreativfabrik Mainz</location>
     <link>http://www.cccmz.de/?p=814</link>
   </event>
+  <event title="Large Hackerspace Convention">
+    <start>2010-08-27</start>
+    <end>2010-08-29</end>
+    <location>RaumZeitLabor, Mannheim</location>
+    <link>http://raumzeitlabor.de/wiki/1._Large_Hackerspace_Convention_%28LHC%29</link>
+  </event>
+  <event title="node.js KO">
+    <start>2010-08-28</start>
+    <end>2010-08-29</end>
+    <link>http://nodeknockout.com/</link>
+  </event>
 </calendar>