From: Robert Kaiser <robert@widebook.box.kairo.at>
Date: Mon, 25 Nov 2013 15:36:34 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/slides
X-Git-Url: https://git-public.kairo.at/?p=slides.git;a=commitdiff_plain;h=3046b5bf4f204dac735647dd492c95e8368c312b;hp=-c;ds=sidebyside

Merge branch 'master' of linz:/srv/git/slides
---

3046b5bf4f204dac735647dd492c95e8368c312b
diff --combined index.html
index a7762a5,c75a850..33d1d38
--- a/index.html
+++ b/index.html
@@@ -52,11 -52,13 +52,13 @@@
    <td>FOSDEM 2013</td>
    <td><a href="fosdem2013/">Improving Stability of Mozilla Products</a></td>
    <td>English</td>
+   <!-- https://air.mozilla.org/improving-the-stability-of-mozilla-products/ -->
  </tr>
  <tr>
    <td>Mozilla Brown Bag, 2012</td>
    <td><a href="brownbag-crashlife-2012/">The Life Cycle of a Firefox Crash</a></td>
    <td>English</td>
+   <!-- https://air.mozilla.org/crash-life-cycl/ -->
  </tr>
  <tr>
    <td>FOSDEM 2012</td>
@@@ -102,7 -104,6 +104,7 @@@
    <td>UBIT Wien - IT Extrazimmer, 01.07.2009</td>
    <td><a href="ubit-wien-2009/">Open-Source-Projektmanagement</a></td>
    <td>German/Deutsch</td>
 +  <!-- http://www.youtube.com/watch?v=N_byj811a48 -->
  </tr>
  <tr>
    <td>Linuxwochen 2009</td>