From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 25 Nov 2013 15:40:13 +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=f436491483ce4062f062d52c709c73925379467c;hp=-c;ds=sidebyside

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

f436491483ce4062f062d52c709c73925379467c
diff --combined index.html
index 4de0070,33d1d38..01d18df
--- a/index.html
+++ b/index.html
@@@ -39,11 -39,6 +39,11 @@@
  </tr>
  </thead>
  <tbody>
 +<tr>
 +  <td>FirefoxOS DevTreff Austria</a></td>
 +  <td><a href="devtreff201311/">Firefox OS: Reasons, Status &amp; Plans</a></td>
 +  <td>English</td>
 +</tr>
  <tr>
    <td rowspan="2">Linuxwochen 2013</td>
    <td><a href="linuxwochen2013-mozilla/">Mozilla - Das Web ist die Plattform</a></td>
@@@ -109,6 -104,7 +109,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>