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

diff --combined minidebconf_vie2016/index.mdwn
index ddf9999ee207b3b5036a8c7c21cc6d630db0ba7e,abfa9524e43d8bfe3a2c00a167e4562d6de9793c..a190a0f1a683ec0c31121101f6b19163ec1075bf
--- 1/minidebconf_vie2016/index.mdwn
--- 2/minidebconf_vie2016/index.mdwn
+++ b/minidebconf_vie2016/index.mdwn
@@@ -17,7 -17,7 +17,7 @@@ exchange ideas
    as a part of [Linuxwochen Wien](http://linuxwochen.at/)
  
  * Location (online): [#debian.or.at at oftc.net](irc://irc.debian.org/debian.or.at),
 -  video streams yet to be announced<!-- at http://video.debconf.org:8000/minidebconf.ogv (in case of trouble, contact #debian-video on irc) -->.
 +  video streams at http://video.debconf.org:8000/minidebconf.ogv (in case of trouble, contact #debian-video on irc).
  
  * Schedule:
  
@@@ -33,11 -33,11 +33,12 @@@
  
    * Lightning talks are scheduled for Sunday 12:00 managed by Nattie. Please
      submit talks to her in person, to [per mail](mailto:nattie@debconf.org) or
 -    on IRC.
 +    on IRC; to make things run smoothly, deliver slides as PDFs to her until
 +    11:00.
  
  * Minutes:
    * [[Day 0|minutes/day0]]
+   * [[Day 1|minutes/day1]]
  
  Registration
  ------------