From 4ff34d95ca1b25aa247fb6f9261d8430a219ea1e Mon Sep 17 00:00:00 2001
From: a klosch <klosch@netresearch.de>
Date: Thu, 10 Nov 2011 23:24:03 +0100
Subject: added stream to sublounge @template/topic

---
 template/topic/topic | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index 9bd8821..a298d0d 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,2 +1,5 @@
+10. November: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a>
+@ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)
+
 26. November: <b>sub:conf</b><br/>
 subconf at sublab dot org
-- 
cgit v1.2.1


From 302456cc43410973008a577140c1d577b465931e Mon Sep 17 00:00:00 2001
From: a klosch <klosch@netresearch.de>
Date: Thu, 10 Nov 2011 23:24:43 +0100
Subject: added stream to sublounge @template/topic again

---
 template/topic/topic | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index a298d0d..d7f3fa7 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,4 +1,4 @@
-10. November: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a>
+10. November: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
 @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)
 
 26. November: <b>sub:conf</b><br/>
-- 
cgit v1.2.1


From 0e6ca43220ac9ba62db225685f782ff9a4e085e2 Mon Sep 17 00:00:00 2001
From: a klosch <klosch@netresearch.de>
Date: Thu, 10 Nov 2011 23:32:19 +0100
Subject: added stream to sublounge @template/topic added br br

---
 template/topic/topic | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index d7f3fa7..2342cbf 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,5 +1,5 @@
 10. November: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
-@ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)
-
+@ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>
+<br/>
 26. November: <b>sub:conf</b><br/>
 subconf at sublab dot org
-- 
cgit v1.2.1


From 67e6a1f83aa8776a39f479732bcc786492061287 Mon Sep 17 00:00:00 2001
From: a klosch <klosch@netresearch.de>
Date: Fri, 11 Nov 2011 14:48:36 +0100
Subject: commented stream in topic

---
 template/topic/topic | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index 2342cbf..7e72b6e 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,5 +1,5 @@
-10. November: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
+<!--10. November: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
 @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>
-<br/>
+<br/>-->
 26. November: <b>sub:conf</b><br/>
 subconf at sublab dot org
-- 
cgit v1.2.1


From 2fb6c62aa323bd1595381b06b5282374f2bab7a2 Mon Sep 17 00:00:00 2001
From: a klosch <klosch@netresearch.de>
Date: Thu, 8 Dec 2011 22:04:35 +0100
Subject: stream added

---
 template/topic/topic | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index 7e72b6e..0851166 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,5 +1,5 @@
-<!--10. November: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
+08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
 @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>
-<br/>-->
+<br/>
 26. November: <b>sub:conf</b><br/>
 subconf at sublab dot org
-- 
cgit v1.2.1


From e3d2113b4d8bc354da6aeb46a3373108c93134cf Mon Sep 17 00:00:00 2001
From: Florian <florianraemisch@web.de>
Date: Wed, 30 Nov 2011 14:19:57 +0100
Subject: updated topic

---
 template/topic/topic | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index 0851166..b96e376 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,5 +1,2 @@
-08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
-@ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>
-<br/>
-26. November: <b>sub:conf</b><br/>
-subconf at sublab dot org
+Die subconf ist vorbei<br>
+Vielen Dank fuers kommen!
-- 
cgit v1.2.1


From 190c15279ad48ea4254c2fb24cb964f2e263ca1a Mon Sep 17 00:00:00 2001
From: Florian <florianraemisch@web.de>
Date: Sat, 3 Dec 2011 21:51:11 +0100
Subject: updated topic

---
 template/topic/topic | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index b96e376..1b55eba 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,2 +1,2 @@
-Die subconf ist vorbei<br>
-Vielen Dank fuers kommen!
+Die <a href="./subconf">subconf</a> ist vorbei!<br>
+Danke fuers kommen.
-- 
cgit v1.2.1


From f9e6b76c6a85f089c0fa9c5d9c33eeb5ecee4a22 Mon Sep 17 00:00:00 2001
From: Florian <florianraemisch@web.de>
Date: Sun, 11 Dec 2011 16:48:19 +0100
Subject: updatet topic for outside the box

---
 template/topic/topic | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index 1b55eba..5c1484a 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,2 +1,3 @@
-Die <a href="./subconf">subconf</a> ist vorbei!<br>
-Danke fuers kommen.
+<!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
+@ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>-->
+Gerade im sublab: Outside the Box Release Party mit Lesung
-- 
cgit v1.2.1


From e6692e2180395d459903925912f2aa8339cc48e1 Mon Sep 17 00:00:00 2001
From: Florian <florianraemisch@web.de>
Date: Wed, 14 Dec 2011 20:33:27 +0100
Subject: updated topic for wotorwoerld

---
 template/topic/topic | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index 5c1484a..1473810 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,3 +1,4 @@
+Freitag im sublab:<br>
+<a href="/neues#2011-12-14-wotorwoerld">W O T Ø R W O E R L D</a>
 <!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
 @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>-->
-Gerade im sublab: Outside the Box Release Party mit Lesung
-- 
cgit v1.2.1


From 32d8908381e57deb6bb24decc422325503eeece0 Mon Sep 17 00:00:00 2001
From: Florian <florianraemisch@web.de>
Date: Sun, 18 Dec 2011 22:37:00 +0100
Subject: updated topic

---
 template/topic/topic | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index 1473810..c64c354 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,4 +1,8 @@
-Freitag im sublab:<br>
+Diese Woche im sublab:<br>
+Mi, ab 20oo: Chaostreff<br>
+Do, ab 21oo: sub:lounge<br>
+
+<!--Freitag im sublab:<br>-->
 <a href="/neues#2011-12-14-wotorwoerld">W O T Ø R W O E R L D</a>
 <!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
 @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>-->
-- 
cgit v1.2.1


From 513eec52ecce5bb8b92a340810e5e5cb0ef4e397 Mon Sep 17 00:00:00 2001
From: Florian <florianraemisch@web.de>
Date: Sun, 18 Dec 2011 22:53:13 +0100
Subject: delted wotorwoerld from topic

---
 template/topic/topic | 2 --
 1 file changed, 2 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index c64c354..bf09369 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -2,7 +2,5 @@ Diese Woche im sublab:<br>
 Mi, ab 20oo: Chaostreff<br>
 Do, ab 21oo: sub:lounge<br>
 
-<!--Freitag im sublab:<br>-->
-<a href="/neues#2011-12-14-wotorwoerld">W O T Ø R W O E R L D</a>
 <!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
 @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>-->
-- 
cgit v1.2.1


From bed32276c554ec86642ac5522b755e4d0d78a821 Mon Sep 17 00:00:00 2001
From: Florian <florianraemisch@web.de>
Date: Mon, 26 Dec 2011 15:46:49 +0100
Subject: added silvesterlounge to topic

---
 template/topic/topic | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index bf09369..35f4d2b 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,6 +1,6 @@
 Diese Woche im sublab:<br>
-Mi, ab 20oo: Chaostreff<br>
-Do, ab 21oo: sub:lounge<br>
+Sa, ab 20oo Phantomspeisung<br>
+Danach Silvesterlounge<br>
 
 <!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
 @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>-->
-- 
cgit v1.2.1


From 4d7fa8c62508eeccc8ef23b68ec63e0d8475cece Mon Sep 17 00:00:00 2001
From: Benjamin Kiessling <mittagessen@l.unchti.me>
Date: Wed, 4 Jan 2012 04:27:26 +0100
Subject: Update topic

---
 template/topic/topic | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index 35f4d2b..e58a206 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,6 +1,7 @@
 Diese Woche im sublab:<br>
-Sa, ab 20oo Phantomspeisung<br>
-Danach Silvesterlounge<br>
+Mi, ab 19oo Fablabstammtisch<br>
+Do, ab 21oo Lounge<br>
+Sa, ab 20oo Phantomspeisung
 
 <!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
 @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>-->
-- 
cgit v1.2.1


From d7e3f2fe8cae10997d866ffd92e1653de93c935b Mon Sep 17 00:00:00 2001
From: Benjamin Kiessling <mittagessen@l.unchti.me>
Date: Mon, 9 Jan 2012 13:03:34 +0100
Subject: Update topic

---
 template/topic/topic | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index e58a206..b7120e8 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,6 +1,7 @@
 Diese Woche im sublab:<br>
-Mi, ab 19oo Fablabstammtisch<br>
-Do, ab 21oo Lounge<br>
+Mo, ab 20oo Montagsrunde FSFE<br>
+Mi, ab 18oo Elektronikrune<br>
+Do, ab 20oo Freifunktreff<br>
 Sa, ab 20oo Phantomspeisung
 
 <!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
-- 
cgit v1.2.1


From 33d2ec32e1f5985baa042b1b837cec6f1a9e6ff0 Mon Sep 17 00:00:00 2001
From: Benjamin Kiessling <mittagessen@l.unchti.me>
Date: Tue, 17 Jan 2012 12:02:40 +0100
Subject: Update topic

---
 template/topic/topic | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index b7120e8..82357d9 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,8 +1,10 @@
 Diese Woche im sublab:<br>
-Mo, ab 20oo Montagsrunde FSFE<br>
-Mi, ab 18oo Elektronikrune<br>
+
+Mi, ab 19oo Chaostreff<br>
+Do, ab 20oo sub:lounge<br>
 Do, ab 20oo Freifunktreff<br>
-Sa, ab 20oo Phantomspeisung
+Sa, ab 20oo Phantomspeisung<br>
+So, ab 18oo Kaffeeklatsch
 
 <!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
 @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>-->
-- 
cgit v1.2.1


From bcfea349d851008606071397e6b01cf8eebc6caf Mon Sep 17 00:00:00 2001
From: Benjamin Kiessling <mittagessen@l.unchti.me>
Date: Mon, 23 Jan 2012 12:28:09 +0100
Subject: Update Topic

---
 template/topic/topic | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'template/topic')

diff --git a/template/topic/topic b/template/topic/topic
index 82357d9..b3f5558 100644
--- a/template/topic/topic
+++ b/template/topic/topic
@@ -1,10 +1,11 @@
 Diese Woche im sublab:<br>
 
-Mi, ab 19oo Chaostreff<br>
-Do, ab 20oo sub:lounge<br>
-Do, ab 20oo Freifunktreff<br>
+Mi, ab 19oo Elektronikrunde<br>
+Do, ab 20oo about:radio Stammtisch<br>
+Do, ab 21oo Freifunktreff<br>
 Sa, ab 20oo Phantomspeisung<br>
-So, ab 18oo Kaffeeklatsch
+So, ab 19oo Westnetzgruendung
+
 
 <!--08. Dezember: <b><a href="http://void.subsignal.org:9000/sublounge.ogg"> livestream</a></b>
 @ sub:lounge (<a href="http://wiki.sublab.org/doku.php?id=veranstaltungen_und_projekte:lounge:stream">wiki</a>)<br/>-->
-- 
cgit v1.2.1