From 473de4255760d1c64a04ae158e9e98314ccd2113 Mon Sep 17 00:00:00 2001
From: baldo <baldo@toppoint.de>
Date: Sun, 13 Sep 2015 11:43:05 +0200
Subject: [PATCH] Schedule update

---
 ffnord-con-2015-2/room/schedule.json | 73 ++++++++++++++++++++++++----
 1 file changed, 64 insertions(+), 9 deletions(-)

diff --git a/ffnord-con-2015-2/room/schedule.json b/ffnord-con-2015-2/room/schedule.json
index b69bd6c..068d5d0 100644
--- a/ffnord-con-2015-2/room/schedule.json
+++ b/ffnord-con-2015-2/room/schedule.json
@@ -161,30 +161,85 @@
     },
 
     {
-        "duration": 60,
+        "duration": 45,
         "lang": "de",
         "place": "attraktor",
         "speakers": [
-            "t.b.a."
+            "tcatm"
         ],
         "start": "11:45",
-        "title": "Vortrags-Slot #3 mit folgender Diskussion und Kaffeepause",
+        "title": "Gluon Konfiguration im normalen Betrieb",
         "type": "talk",
         "unix": 1442137500,
-        "unix_end": 1442141100
+        "unix_end": 1442140200 
     },
 
     {
-        "duration": 150,
+        "duration": 45,
+        "lang": "de",
+        "place": "attraktor",
+        "speakers": [
+            "tcatm"
+        ],
+        "start": "12:45",
+        "title": "Mesh-unabhängiger Autoupdater",
+        "type": "talk",
+        "unix": 1442141100,
+        "unix_end": 1442143800
+    },
+
+    {
+        "duration": 45,
+        "lang": "de",
+        "place": "sofa-ecke",
+        "speakers": [
+            "tcatm"
+        ],
+        "start": "13:45",
+        "title": "Memorandum of Understanding",
+        "type": "talk",
+        "unix": 1442144700,
+        "unix_end": 1442147400
+    },
+
+    {
+        "duration": 45,
+        "lang": "de",
+        "place": "sofa-ecke",
+        "speakers": [
+            "andr3"
+        ],
+        "start": "12:45",
+        "title": "Workshop - Dienste",
+        "type": "talk",
+        "unix": 1442141100,
+        "unix_end": 1442143800
+    },
+
+    {
+        "duration": 90,
+        "lang": "de",
+        "place": "NÄHSTUBE",
+        "speakers": [
+        ],
+        "start": "14:30",
+        "title": "Hacking Time",
+        "type": "talk",
+        "unix": 1442147400,
+        "unix_end": 1442152800
+    },
+
+    {
+        "duration": 90,
         "lang": "de",
         "place": "attraktor",
         "speakers": [
         ],
-        "start": "13:00",
-        "title": "Workshop und Hacking Time",
+        "start": "14:30",
+        "title": "Hacking Time",
         "type": "talk",
-        "unix": 1442142000,
-        "unix_end": 1442151000
+        "unix": 1442147400,
+        "unix_end": 1442152800
     },
 
     {