Merge branch 'master' of debienna.at:debienna

diff --combined Kalender/2014-07-10/index.mdwn
index fcbd1584f9b37042b56ecc47e459c8f29db74887,7e56ccd4b236327a8fe9d919d762c2305a482288..0764f3d86a45f537aa44303264b69057216fa4fc
--- 1/Kalender/2014-07-10/index.mdwn
--- 2/Kalender/2014-07-10/index.mdwn
+++ b/Kalender/2014-07-10/index.mdwn
@@@ -9,6 -9,11 +9,11 @@@ ab 19:00 ist der Raum reservier
  
  * Rechnerflotte verwalten
   * Updates
+   * Automatical merging of configuration (maintainer's and own changes)
+   * Writing Debhelper addons
+   * [Elektra](http://www.libelektra.org) GSOC: Improving configuration upgrades in debian
+   * Adding conffile hooks to dpkg
+   * 
   * Pakete
   * Dot Files
   * Logs & Errors
@@@ -20,11 -25,6 +25,6 @@@
  
  * Storage
   * LVM's Caching Feature 
- * [Elektra](http://www.libelektra.org) 0.8.6 released
-  * Python3, Lua, C++ bindings
-  * logging to journald
-  * augeas plugin (store and read any configuration file via lenses)
-  * GSOC started: Improving configuration upgrades in debian
  * Neue Debienna Shirts
   * Wo bestellen?
   * Was soll drauf?
@@@ -33,7 -33,6 +33,7 @@@
  ### Fragen
  
  * make ifup/ifdown to not change the hostname?
 + * this is a dhcp-client problem, e.g. isc-dhcp can configure this
  * Mehrere Volumes mit dem selben Key verschlüsseln (luks)? 
  * Wörter springen in der Shell? Was ist der richtige Alias?
  * Alias in der Form "command args" --> "command aliased args"? Ist das möglich?
@@@ -52,6 -51,7 +52,7 @@@
     on a DVI -> VGA Adapter
   * Another hint: check the xorg.log. there you see which modes are from config
     and which are probed
+ * Mouse gets disconnected from time to time
  * Kennt jemand eine C library, die nützlich ist um Programme zum
    Steuern von Maschinen zu schreiben?
    * Warum eine Library wenn es der Kernel tun kann?
@@@ -68,5 -68,6 +69,6 @@@
  ### Wer kommt?
  
  * SebastianBachmann
+ * MarkusRaab
  * ...