From d57c4afcb0f6112f50f1821a2252fe2fed4e7614 Mon Sep 17 00:00:00 2001
From: Jan Paul Tuecking <earl@ipfire.org>
Date: Mon, 7 Dec 2009 19:18:32 +0100
Subject: [PATCH] Added talk about ipfire from commander1024 to webpage.

---
 www/news.json              | 21 +++++++++++++++++++++
 www/pages/static/links.xml | 12 +++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/www/news.json b/www/news.json
index ae96d502..5bae3a95 100644
--- a/www/news.json
+++ b/www/news.json
@@ -407,6 +407,27 @@
 								nun an Teil des Teams aufgrund ihrer beständigen und langen Mitarbeit am Projekt.</p>
 								<p>
 									<a href=\"http://wiki.ipfire.org/de/project/contribute\" target=\"_blank\">Wie kann ich selber zum Projekt beitragen?</a>
+								</p>"}},
+										
+		"24" : {"author"   : "Jan Paul Tücking",
+				"mail"     : "earl@ipfire.org",
+				"subject"  : { "en" : "talk about IPFire", "de" : "Vortrag über IPFire" },
+				"date"     : "2009-12-06",
+				"link"     : "",
+				"content"  :
+					{ "en" : "<p>Marcus Scholz did a <a href=\"http://www.commander1024.de/wordpress/2009/12/ipfire-talk-in-der-warpzone/\">talk</a> about
+							 IPFire at the <a href=\"warpzone.ms/\">Warpzone</a>, a 
+							 <a href=\"http://www.commander1024.de/wordpress/wp-content/uploads/2009/12/IPFire-Talk.pdf\">draft</a> 
+							 is available as well as a <a href=\"http://qik.com/video/3807703\">video</a>.
+							  </p>",
+
+					  "de" : "<p>Marcus Scholz hat einen <a href=\"http://www.commander1024.de/wordpress/2009/12/ipfire-talk-in-der-warpzone/\">Vortrag</a> über
+					  		  IPFire in der <a href=\"warpzone.ms/\">Warpzone</a> gehalten. Die dazugehörigen  
+					  		  <a href=\"http://www.commander1024.de/wordpress/wp-content/uploads/2009/12/IPFire-Talk.pdf\">Folien</a> 
+					  		  so wie ein <a href=\"http://qik.com/video/3807703\">Video</a> von seiner Presentation stehen zur Verfügung.
 								</p>"}}
+								
+								
+
 }
 
diff --git a/www/pages/static/links.xml b/www/pages/static/links.xml
index 09f433a3..ea73492b 100644
--- a/www/pages/static/links.xml
+++ b/www/pages/static/links.xml
@@ -61,8 +61,18 @@
 																	    <td>Sebastian Winter</td>
 																	  </tr>
 																	</table>
+											<br />
                                 ]]></Content>
-
+                                <Content lang="en"><![CDATA[
+                        					Marcus Scholz (Commander1024) did a <strong>talk</strong> about IPFire at the 
+                        					<em>Warpzone</em>,
+                        					a <a href="http://www.commander1024.de/wordpress/wp-content/uploads/2009/12/IPFire-Talk.pdf">draft</a> is available as well as a <a href="http://qik.com/video/3807703">video</a>.
+                              	]]></Content>
+                                <Content lang="de"><![CDATA[
+                        					Marcus Scholz (Commander1024) hat einen <strong>Vortrag</strong> über IPFire in der 
+                        					<em>Warpzone</em>
+                        					gehalten, wer will kann sich das <a href="http://www.commander1024.de/wordpress/wp-content/uploads/2009/12/IPFire-Talk.pdf">Paper</a> wie auch das <a href="http://qik.com/video/3807703">Video</a> des Vortrags anschauen.
+                              	]]></Content>
                 </Paragraph>
                 <Paragraph>
                 		<Heading lang="en">IPFire in Media</Heading>
-- 
2.47.3