From: Markus Raab <elektra@markus-raab.org>
Date: Tue, 3 Dec 2013 14:47:10 +0000 (+0100)
Subject: Merge branch 'master' of ssh://debienna.at/debienna
X-Git-Url: https://git.deb.at/?p=debienna.git;a=commitdiff_plain;h=73450bcacd6925dcd99149e732b799ab3ee03ead;hp=233126969c1282a756e32fd6f4f1ecf6f2e91676

Merge branch 'master' of ssh://debienna.at/debienna
---

diff --git a/Kalender/2013-12-19.mdwn b/Kalender/2013-12-19.mdwn
deleted file mode 100644
index 8c4cc70..0000000
--- a/Kalender/2013-12-19.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-[[!meta date="2013-12-19"]]
-
-### Ort
-
-im [Metalab](http://www.metalab.at/) (Bibliothek)
-
-### Themenabend Future of Desktop
-
-ab 20:00
-
-* Showing some Tools: coop-archive, coop-calendar
-* Discussion: Future of coop-* Tools and the Linux Desktop
-* ...
-
-### sonstige Themen
-
-* Hopefully :-) demo of Elektra 0.8.4
-* Ist jemand bei Fosdem?
-* ...
-
-### Quote
-
-> This book is dedicated to anyone and everyone who understands that
-> hacking and learning is a way to live your life, not a day job or
-> semi-ordered list of instructions found in a thick book.
->  -- Chris Anley, John Heasman, Felix “FX” Linder, Gerardo Richarte
-> [Found here](http://techie.coolpage.biz/examples/theshellcsmall.pdf)
-
-### Wer kommt?
-
-* MarkusRaab
-* Leo
-* ...
diff --git a/Kalender/2013-12-19/index.mdwn b/Kalender/2013-12-19/index.mdwn
new file mode 100644
index 0000000..0cec8f6
--- /dev/null
+++ b/Kalender/2013-12-19/index.mdwn
@@ -0,0 +1,34 @@
+[[!meta date="2013-12-19"]]
+
+### Ort
+
+im [Metalab](http://www.metalab.at/) (Bibliothek)
+
+### Themenabend Future of Desktop
+
+ab 20:00
+
+* Showing some Tools: coop-archive, coop-calendar
+* Discussion: Future of coop-* Tools and the Linux Desktop
+* ...
+
+### sonstige Themen
+
+* Hopefully :-) demo of Elektra 0.8.4
+* Ist jemand bei Fosdem?
+* ...
+
+### Quote
+
+> This book is dedicated to anyone and everyone who understands that
+> hacking and learning is a way to live your life, not a day job or
+> semi-ordered list of instructions found in a thick book.
+>  -- Chris Anley, John Heasman, Felix “FX” Linder, Gerardo Richarte
+> [Found here](http://techie.coolpage.biz/examples/theshellcsmall.pdf)
+
+### Wer kommt?
+
+* MarkusRaab
+* Leo
+* SebastianBachmann
+* ...