From d7b656aac9ecc6ed6da8e8162a725f5d300cc2e2 Mon Sep 17 00:00:00 2001
From: Manuel Traut <manut@mecka.net>
Date: Fri, 1 Apr 2011 12:40:52 +0200
Subject: index.txt - updated linuxtag section

Signed-off-by: Manuel Traut <manut@mecka.net>
---
 index.txt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'index.txt')

diff --git a/index.txt b/index.txt
index 0b6addd..c2a949d 100644
--- a/index.txt
+++ b/index.txt
@@ -1,5 +1,29 @@
 Linux Kernelprogrammierung
 
+Linuxtag:
+=========
+Mi 11. - Sa 14. Mai Messe Berlin - Vorlesung entfällt
+
+Excursion from 11th to 15th of May.
+Conference Schedule online
+
+Costs:
+Hotel:  about 30 EUR / night = 120 EUR
+Train:  150 .. 200 EUR
+Ticket: 16 EUR (four day ticket), LinuxNacht 38 EUR (incl. Drinks and Meals)
+
+~300 EUR - grant from University
+
+Plesae mail me until Monday if you want to join. (manut@mecka.net)
+
+I try to get there as cheap as possible, however I cannot say, how much the trip
+will cost. You can include a constraints in your mail, e.g. maximum costs. ;-)
+
+weitere Termine:
+================
+11. - 14. April Exkursionswoche??
+
+
 LWN - summary:
 ==============
 
-- 
cgit v1.2.3