From dd5ded07d706802fb6deb012fb5ef27895802d88 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 2 May 2014 17:35:06 +0200
Subject: [PATCH] events: CryptoCon14

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

diff --git a/content/events.xml b/content/events.xml
index e3153fe20..889905c18 100644
--- a/content/events.xml
+++ b/content/events.xml
@@ -2007,4 +2007,10 @@
 		<location>Kulturbrauerei, Berlin</location>
 		<link>http://2014.okfestival.org/</link>
 	</event>
+	<event title="CryptoCon">
+		<start>2014-05-22</start>
+		<end>2014-05-25</end>
+		<location>sublab, Leipzig</location>
+		<link>http://sublab.org/cryptocon14</link>
+	</event>
 </calendar>