Removed Wiki idea to Ohter Ideas list since it overlaps with the new Document Editor.
diff --git a/GSoC2010Ideas.wiki b/GSoC2010Ideas.wiki
index 756105a..506895e 100644
--- a/GSoC2010Ideas.wiki
+++ b/GSoC2010Ideas.wiki
@@ -27,38 +27,6 @@
 ----
 = Idea Details =
 ----
-----
-
-= New Document Editor =
-
-= Improving Documenting system/Adding a Wiki =
-
-===Description===
-Either integrating [http://en.wikipedia.org/wiki/MoinMoin MoinMoin] or [http://en.wikipedia.org/wiki/Rietveld_(Software) Rietveld].  We're looking for a bit more than just having these in the same web server!  We want to be able to do diffs and revision histories on our documents.  We'd like to be able to have Melange tables show up in wiki pages.  We'd like to be able to create wiki pages based on a template specified as a quiz.
-
-<temp>
-Requirements for the editor:
--Using a markup language, be careful with raw HTML
-  - Be able to add our own tags, perhaps for enabling code highlighting in specified sections
--Anchor support
--Be able to show images
--Be able to add links
--Be able to control the layout/appearance (left,right,center,bold,italic,color etc…)
--Automatically generate a table of contents
--Anyone should be able to create a document!!!
--Documents must be automatically saved while the user is working on it
-
-Backend requirements:
--Be able to add attachments
--Be able to generate user viewable diffs, however you should have the option to not generate diffs for certain documents.
--Document Access control
-</temp>
-
-===Difficulty===
-
-===Mentors ===
-
-----
 
 = New Document Editor =
 
@@ -250,8 +218,8 @@
 
 = Other ideas =
 
+  * Write a Wiki module, that adds Wiki functionality to Melange
   * integrate OpenSocial into Melange
-  * write tests
   * add functional tests using twill
   * extend functionality of our buildbot (post commit hooks, pylint integration, application deployment to testing App Engine instance)
   * add features that will enable to organize GSoC/GHOP Meetings (creating new events, managing participants, integration with Google Calendar API),