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=3046b5bf4f204dac735647dd492c95e8368c312b

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

diff --git a/index.html b/index.html
index 33d1d38..01d18df 100644
--- a/index.html
+++ b/index.html
@@ -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>