[planet-web] Revert GSOC removals

[Alberto Ruiz <aruiz src gnome org>]

commit 86ac650df49b6d48d84a9b53958c899aa975efdc
Author: Alberto Ruiz <aruiz gnome org>
Date:   Fri Apr 8 16:39:27 2011 +0100

    Revert GSOC removals

 config/people/config.ini |  170 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 166 insertions(+), 4 deletions(-)
---
diff --git a/config/people/config.ini b/config/people/config.ini
index 914d028..4ab231d 100644
--- a/config/people/config.ini
+++ b/config/people/config.ini
@@ -1802,8 +1802,173 @@ name = Josselin Mouette
 nick = Np237
 
 ########################################################################
+
+## GUADEC 2010 organizers who are not foundation members
+
+[http://wordpress.metro.cx/category/subject/science-n-stuff/guadec/feed/]
+name = Koen Martens
+nick = gmc
+guadec = 1
+
+## GSoC 2009 Students
+
+[http://zaspire-in-it.blogspot.com/feeds/posts/default?alt=rss]
+name = Maxim Ermilov
+#face =
+#nick =
+
+[http://blog.zhangsen.org/feeds/posts/default/-/gnome]
+name = Zhang Sen
+face = http://planet.gnome.org/heads/gsoc/zhangsen.png
+nick = jessezh
+
+[http://nloko.ca/?tag=gnome&feed=rss]
+name = Neil Loknath
+face = http://planet.gnome.org/heads/gsoc/nloko.png
+nick = nloko
+
+[http://damino.ca/?feed=rss2]
+name = Guillaume Beland
+#face =
+nick = guillaumebel
+
+[http://bloc.eurion.net/archives/category/gnome-planet/atom]
+name = Siegfried-Angel Gevatter Pujals
+#face =
+nick = RainCT
+
+[http://www.hortont.com/blog/topics/code/feed/rss.xml]
+name = Tim Horton
+face = http://planet.gnome.org/heads/gsoc/hortont.png
+nick = hortont424
+
+[http://simon.vanderlinden.eu.org/feed/tag/gsoc/atom]
+name = Simon van der Linden
+face = http://planet.gnome.org/heads/gsoc/sivanderlinden.png
+nick = sivanderlinden
+
+[http://foregroundnoise.wordpress.com/category/gnome/feed/]
+name = Simon Wenner
+face = http://planet.gnome.org/heads/gsoc/wenner.png
+nick = wenner
+
+[http://mikeurbanski.blogspot.com/feeds/posts/default]
+name = Mike Urbanski
+#face =
+nick = mcu
+
+## GSoC 2010 Students
+
+[http://feeds2.feedburner.com/sssuptech]
+name = Luca Invernizzi 
+face = http://planet.gnome.org/heads/gsoc/linvernizzi.png
+nick = linvernizzi
+gsoc2010 = 1
+
+[http://axsaprykin.blogspot.com/feeds/posts/default?alt=rss]
+name = Alexander Saprykin
+face = http://planet.gnome.org/heads/gsoc/asaprykin.png
+nick = asaprykin
+gsoc2010 = 1
+
+[http://mhr3.blogspot.com/feeds/posts/default?alt=rss]
+name = Michal Hruby
+#face =
+#nick =
+gsoc2010 = 1
+
+[http://feeds.feedburner.com/Yuvisense/]
+name = Yuvaraj Pandian
+#face =
+nick = YuviPanda
+gsoc2010 = 1
+
+[http://ssickert.wordpress.com/feed]
+name = Salomon Sickert
+#face =
+nick = ssickert
+gsoc2010 = 1
+
+[http://thiblahute.blogspot.com/feeds/posts/default]
+name = Thibault Saunier
+face = http://planet.gnome.org/heads/thiblahute.png
+nick = thiblahute
+gsoc2010 = 1
+
+[http://freesteph.info/feed/category/GNOME/atom]
+name = Stéphane Maniaci
+#face =
+nick = freesteph
+gsoc2010 = 1
+
+[http://paul.kishimoto.name/taxonomy/term/56/0/feed]
+name = Paul Kishimoto
+#face =
+nick = khaeru
+gsoc2010 = 1
+
+[http://blogs.gnome.org/abustany/feed]
+name = Adrien Bustany
+face = http://planet.gnome.org/heads/gsoc/abustany.png
+nick = abustany
+gsoc2010 = 1
+
+[http://dragos-dena.blogspot.com/feeds/posts/default/-/planet-gnome]
+name = Dragos Dena
+face = http://planet.gnome.org/heads/gsoc/dragos-dena.png
+nick = dragos-dena
+gsoc2010 = 1
+
+[http://perditusinventusque.blogspot.com/feeds/posts/default/-/gnome]
+name = Matt Novenstern
+face = http://planet.gnome.org/heads/gsoc/mnovenstern.png
+#nick =
+gsoc2010 = 1
+
+[http://karlojez.wordpress.com/category/planet-gnome/feed]
+name = Karlo Jež
+#face =
+#nick =
+gsoc2010 = 1
+
+[http://neosergio.net/category/gnome/feed]
+name = Sergio Infante Montero
+face = http://planet.gnome.org/heads/gsoc/smontero.png
+#nick =
+gsoc2010 = 1
+
+[http://pecisk.blogspot.com/feeds/posts/default?alt=rss]
+name = PÄ?teris KriÅ¡jÄ?nis
+#face =
+#nick =
+gsoc2010 = 1
+
+[http://arosenfeld.wordpress.com/feed]
+name = Alexandre Rosenfeld
+#face =
+#nick =
+gsoc2010 = 1
+
+[http://15jamie20.wordpress.com/feed]
+name = Jamie Nicol
+#face =
+#nick =
+gsoc2010 = 1
+
+[http://attente.ca/category/gnome/feed]
+name = William Hua
+#face =
+#nick =
+gsoc2010 = 1
+
+[http://emelelvin.blogspot.com/feeds/posts/default]
+name = Emel Elvin Yildiz
+#face =
+#nick =
+gsoc2010 = 1
+
 ## OPW 2010 Participants
-##
+
 [http://programmermusings.blogspot.com/feeds/posts/default/-/gnome]
 name = Laura Lucas Alday
 face = http://planet.gnome.org/heads/opw/stringlau.png
@@ -1852,7 +2017,6 @@ name = Hellyna Ng
 #face = http://planet.gnome.org/heads/opw/hellyna.png
 nick = hellyna
 opw2010 = 1
-<<<<<<< HEAD
 
 ## BROKEN FEEDS
 
@@ -1996,5 +2160,3 @@ opw2010 = 1
 #name = Radek Doulik
 ##face = http://planet.gnome.org/heads/rodo.png
 #nick = rodo
-=======
->>>>>>> Remove GSOCs and broken feeds