From: chrysn <chrysn@fsfe.org>
Date: Thu, 21 Apr 2016 21:02:45 +0000 (+0200)
Subject: Merge branch 'master' of git.deb.at:debienna
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=b530b8248d5ab61283ee10cb8a81cfc33642c619;hp=2f87ee80c53fb95b593ebe63c902a0e548c2cca0;p=debienna.git

Merge branch 'master' of git.deb.at:debienna
---

diff --git a/minidebconf_vie2016/planning/places.mdwn b/minidebconf_vie2016/planning/places.mdwn
new file mode 100644
index 0000000..e202ec5
--- /dev/null
+++ b/minidebconf_vie2016/planning/places.mdwn
@@ -0,0 +1,31 @@
+Hotels
+======
+
+* Harry's Hotel: 
+  [a 20 minutes walk](http://map.project-osrm.org/?z=17&center=48.238584,16.381549&loc=48.240354,16.386407&loc=48.239300,16.376808&hl=en&alt=0) or via U6 to Handelskai
+
+
+Transport
+=========
+
+* U6: 
+  [walk](http://map.project-osrm.org/?z=17&center=48.238398%2C16.380358&loc=48.237258%2C16.380283&loc=48.239352%2C16.377343&hl=en&alt=0)
+
+* Train:
+  via U6, Dresdner Straße - Handelskai, 1 Station in direction Floridsdorf.
+
+* Airport:
+  via U6, Train, S7 Handelskai - Flughafen Wien, or via [Router](http://m.qando.at/wl_qando_mobileweb/routeSelect) from Dresdnerstraße or Hochstädtplatz to Airport Vienna
+
+* Timetables/Contact: 
+   - [Train](http://fahrplan.oebb.at/bin/query.exe/en?)
+   - [Vienna Public Transport](http://m.qando.at/wl_qando_mobileweb/routeSelect)
+   - [Taxi](https://www.wien.info/en/travel-info/to-and-around/taxi)
+
+
+Nearby
+======
+
+* [Shop](http://map.project-osrm.org/?z=18&center=48.238464%2C16.377917&loc=48.239330%2C16.377300&loc=48.237962%2C16.378689&hl=en&alt=0)
+* Drugstore [Basic](http://map.project-osrm.org/?z=18&center=48.238921%2C16.378121&loc=48.239330%2C16.377300&loc=48.238623%2C16.376930&hl=en&alt=0) / [Health](http://map.project-osrm.org/?z=18&center=48.239736%2C16.377091&loc=48.239330%2C16.377300&loc=48.239288%2C16.376608&hl=en&alt=0)
+* Eat/Drink: Noodle King, Tchibo, Tauber, Bauernschmakerl, ...