X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=config%2Fconfig.ini;h=22f2079e64a5fff6a5cc6af2b9d21f3107ae56ad;hb=0407df61f976e37da3f7f3ed9ed8b505f111e5dc;hp=bc05e4d2255c6d9dc2a331087ebfc54e21f1cd4d;hpb=de4e560c97dc32db2cf528de9903924740989ab0;p=deb%2Fhackedgotchi.git

diff --git a/config/config.ini b/config/config.ini
index bc05e4d..22f2079 100644
--- a/config/config.ini
+++ b/config/config.ini
@@ -526,11 +526,11 @@ face = debconf12.png
 facewidth = 37
 faceheight = 92
 
-# 2011-08-22, joerg
-# disabled due to content not fit for planet and due to
-# not showing who did the post (as required for team blogs)
-#[http://debianmed.blogspot.com/feeds/posts/default?alt=rss]
-#name = Debian Med
+# 2012-03-17, tille
+# reactivated, because now the names of posters are added
+# and it was clarified not to add amazon advertising.
+[http://debianmed.blogspot.com/feeds/posts/default?alt=rss]
+name = Debian Med
 
 [http://dsa.debian.org/dsablog/index.rss]
 name = Debian Sysadmin Team
@@ -606,12 +606,14 @@ faceheight = 91
 [http://warmenhoven.org/blog/feed/]
 name = Eric Warmenhoven
 
-# 2011-12-14 - joerg - timeout
-# [http://www.vitavonni.de/blog/feeds/en.atom]
-# name = Erich Schubert
-# face = erich.png
-# facewidth = 76
-# faceheight = 100
+[http://www.vitavonni.de/blog/feeds/en.atom]
+name = Erich Schubert
+face = erich.png
+facewidth = 76
+faceheight = 100
+
+[http://www.eshat.de/blog/?tag=debianplanet&feed=atom]
+name = Eshat Cekar
 
 # Added by Enrico Zini, currently in NM queue
 [http://jackyf.livejournal.com/data/rss?tag=debian-en]
@@ -983,6 +985,7 @@ name = Kai Wasserbäch
 
 [http://0x1f1f.wordpress.com/feed/atom]
 name = Kartik Mistry
+nick = kart_
 face = kartik.png
 facewidth = 75
 faceheight = 90
@@ -1164,6 +1167,13 @@ faceheight = 83
 #facewidth = 80
 #faceheight = 90
 
+[http://www.hastexo.com/blogs/martin/tag/debian/feed/]
+name = Martin G. Loschwitz
+face = madkiss.png
+nick = Madkiss
+facewidth = 65
+faceheight = 97
+
 [http://www.sourceguru.net/tag/debian/feed/]
 name = Martin Meredith
 face = mez.png
@@ -1437,10 +1447,11 @@ faceheight = 64
 name = Ondřej Čertík
 
 # 2011-12-13 - joerg - 404
-# [http://www.nardol.org/feed/debian]
-# name = Pablo Lorenzzoni
-# face = spectra.png
-# faceheight = 89
+# 2012-03-13 - spectra - I'm back!
+[http://www.nardol.org/category/debian-floss/feed/]
+name = Pablo Lorenzzoni
+face = spectra.png
+faceheight = 89
 
 [http://pstorralba.blogspot.com/feeds/posts/default/-/tech]
 name = Pablo S. Torralba
@@ -1931,6 +1942,12 @@ face = corsac-planet.png
 facewidth = 80
 faceheight = 81
 
+[http://blog.halon.org.uk/category/geek/feed/]
+name = Neil McGovern
+face = neilm.png
+facewidth = 65
+faceheight = 75
+
 # 2011-12-13 - joerg - 404
 # [http://blog.zakame.net/tags/debian/rss]
 # name = Zak B. Elep