diff --git a/MeetingAgendasNotes.wiki b/MeetingAgendasNotes.wiki
index c32270d..eada7e8 100644
--- a/MeetingAgendasNotes.wiki
+++ b/MeetingAgendasNotes.wiki
@@ -12,14 +12,49 @@
 == 31 May 2010 Team Conference Call == 
 
 * Chaired by:* Lennard de Rijk <br/>
-* Notes taken by:* TBD<br/>
+* Notes taken by:* Felix Kerekes<br/>
 
   # Planning Q3-Q4, what do you want to do?
   # Update all other GSoC Projects
   # Round the table
 
 === Meeting notes 31 May 2010 ===
-TBD
+
+	* New document editor
+		* Pavel's wiki missing timeline for second half
+			* Pavel is not sure about the timeline
+			* Goal for the midterm: finishing revision control
+			* Second part should involve deploying and integrating MarkItUp and Markdown
+		* Pavel would like to discuss possible options (which are posted on the wiki)
+		* Conclusions:
+			* Document model should be refactored: add revisions as a ListProperty
+			* There is no point to create separate model for revision, Work can be refactored
+			* Revision descriptions will be included as StringListProperty in Document model for easy access
+
+	* Social features
+		* Missing second part for timeline
+			* Maps left for second part of the project
+		* Savitha pushed some changes to http://melange-social-features.appspot.com
+			* Would be nice to embed Google Calendar
+			* Tabs will be populated in the next days
+
+	* Data seeder
+		* Felix needs to have a meeting with Mario to discuss the AJAX API
+
+	* Testing
+		* Leo has committed some test which are looking good
+		* Tests should be reviewed and pushed to Melange if everything's fine
+		* Sverre will check coverage and see if important functionality is covered
+
+	* TODO for students
+		* All developers should be added as project members on everyone's clone
+			* "Allow non-members to review code" should be checked
+		* Add "melange-soc-commits@googlegroups.com" to activity notifications
+
+	* Q3-Q4 planning
+		* Mario has enough work to do on the user interface and refactoring JavaScript
+		* Mario would like to postpone designing propotype UI to 1st of August (and edit the wiki page)
+		* Daniel is missing...
 
 = Past Meeting Agendas & Call Notes =