Merge branch 'master' of ssh://debienna.at/debienna

diff --combined Kalender/2014-01-30/index.mdwn
index 874f5c05ec5a2a2bae20b1bcd1b7f52819fb467d,46dfb2746658e0072de5c00460a7510affd571bc..a4a8b49d18cac85c08a6d05d0c41c781ceaa076b
--- 1/Kalender/2014-01-30/index.mdwn
--- 2/Kalender/2014-01-30/index.mdwn
+++ b/Kalender/2014-01-30/index.mdwn
@@@ -18,16 -18,10 +18,16 @@@ ab 18:00 ist der Raum reservier
  
  ### sonstige Themen
  
 +* Elektra: Short demo
 + * Generate type safe get/set functions
 + * Generate getopt code
 + * Generate html docu
  * Kolab packages
   * https://blogs.fsfe.org/pboddie/?p=606
   * https://blogs.fsfe.org/pboddie/?p=623
  * NPAPI, PPAPI
 +* Software Defenses Using Compiler Techiques
 + * https://air.mozilla.org/software-defenses-using-compiler-techniques/
  * ...
  
  
@@@ -44,5 -38,7 +44,7 @@@
  
  * SebastianBachmann
  * MarkusRaab
+ * [[chrysn]]
+ * harald
  * ...