From: chrysn <chrysn@fsfe.org>
Date: Thu, 28 Apr 2016 13:42:01 +0000 (+0200)
Subject: Merge branch 'master' of git.deb.at:debienna
X-Git-Url: https://git.deb.at/?p=debienna.git;a=commitdiff_plain;h=21c8a542b15b2af4e23cb2cddd4e62417ab2065f;hp=6a85e8fb911f4f5b029ed706d1e6649c84237a42

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

diff --git a/minidebconf_vie2016/index.mdwn b/minidebconf_vie2016/index.mdwn
index 3753949..f16227b 100644
--- a/minidebconf_vie2016/index.mdwn
+++ b/minidebconf_vie2016/index.mdwn
@@ -24,6 +24,8 @@ exchange ideas.
   * MiniDebCamp open from 10:00 to 19:00 on Thu/Fri in room F4.02; in demand:
     Sat in F4.02, Sun in F0.01
 
+  * FreedomBox packaging workshop on Friday 10:00 in room F4.07
+
   * Talks on Debian fade in from the Linuxwochen program
     [on Saturday around 12:00 in room F0.02](https://cfp.linuxwochen.at/de/LWW16/public/schedule/2),
     and continue on [Sunday from 10:00 to 16:00](https://cfp.linuxwochen.at/de/LWW16/public/schedule/3).