From 583f5c172cd6d137c4c580cd5da6c98201a40d47 Mon Sep 17 00:00:00 2001
From: baldo <baldo@toppoint.de>
Date: Sat, 12 Sep 2015 12:32:02 +0200
Subject: [PATCH] Schedule aktualisiert

---
 ffnord-con-2015-2/room/schedule.json | 70 +++++++++++++++++-----------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/ffnord-con-2015-2/room/schedule.json b/ffnord-con-2015-2/room/schedule.json
index 0fc79a0..d35181d 100644
--- a/ffnord-con-2015-2/room/schedule.json
+++ b/ffnord-con-2015-2/room/schedule.json
@@ -26,17 +26,30 @@
     },
 
     {
-        "duration": 60,
+        "duration": 90,
         "lang": "de",
-        "place": "attraktor",
+        "place": "extern",
         "speakers": [
-            "kantorkel"
         ],
-        "start": "12:15",
-        "title": "Freifunk für Flüchtlinge",
+        "start": "12:30",
+        "title": "Besichtigung eines Richtfunk-Standorts",
         "type": "talk",
-        "unix": 1442052900,
-        "unix_end": 1442056500 
+        "unix": 1442053800,
+        "unix_end": 1442059200
+    },
+
+    {
+        "duration": 90,
+        "lang": "de",
+        "place": "NÄHSTUBE",
+        "speakers": [
+            "DO9XE"
+        ],
+        "start": "12:30",
+        "title": "Workshop - Offloader",
+        "type": "talk",
+        "unix": 1442053800,
+        "unix_end": 1442059200
     },
 
     {
@@ -44,13 +57,13 @@
         "lang": "de",
         "place": "attraktor",
         "speakers": [
-            "andr3"
+            "kantorkel"
         ],
-        "start": "14:00",
-        "title": "Planung von Richtfunk-Standorten",
+        "start": "14:30",
+        "title": "Freifunk für Flüchtlinge",
         "type": "talk",
-        "unix": 1442059200,
-        "unix_end": 1442062800
+        "unix": 1442061000,
+        "unix_end": 1442064600
     },
 
     {
@@ -67,17 +80,31 @@
         "unix_end": 1442066400
     },
 
+    {
+        "duration": 60,
+        "lang": "de",
+        "place": "attraktor",
+        "speakers": [
+            "andr3"
+        ],
+        "start": "16:00",
+        "title": "Planung von Richtfunk-Standorten",
+        "type": "talk",
+        "unix": 1442066400,
+        "unix_end": 1442070000
+    },
+
     {
         "duration": 240,
         "lang": "de",
         "place": "attraktor",
         "speakers": [
         ],
-        "start": "16:00",
+        "start": "17:00",
         "title": "Workshop und Hacking Time",
         "type": "talk",
-        "unix": 1442066400,
-        "unix_end": 1442080800
+        "unix": 1442070000,
+        "unix_end": 1442084400
     },
 
     {
@@ -93,19 +120,6 @@
         "unix_end": 1442080800
     },
 
-    {
-        "duration": 90,
-        "lang": "de",
-        "place": "extern",
-        "speakers": [
-        ],
-        "start": "18:00",
-        "title": "Besichtigung eines Richtfunk-Standorts",
-        "type": "talk",
-        "unix": 1442073600,
-        "unix_end": 1442079000
-    },
-
     {
         "duration": 60,
         "lang": "de",