[SCM] wiki-content branch, master, updated. 34b92949cea731b7484165249306c2f8111703dd

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 34b92949cea731b7484165249306c2f8111703dd
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Nov 3 00:30:56 2011 +0100

    Avoid reference to alioth project on project team page and list people directly.

diff --git a/project/team.mdwn b/project/team.mdwn
index 657802e..ee94072 100644
--- a/project/team.mdwn
+++ b/project/team.mdwn
@@ -3,15 +3,34 @@
 ## Infrastructure
 
   * Website: [http://live.debian.net/](http://live.debian.net/)
-  * Alioth Project: [http://alioth.debian.org/projects/debian-live/](http://alioth.debian.org/projects/debian-live/)
   * Documentation: [http://live.debian.net/manual/](http://live.debian.net/manual/)
 
 ## [[Contact]]
 
 ## Usual roles
 
-People working on Debian Live are listed here:
-[http://alioth.debian.org/project/memberlist.php?group_id=30929](http://alioth.debian.org/project/memberlist.php?group_id=30929)
+The following list of people (alphabetically sorted) are regularly working with Debian Live:
+
+  * Ben Armstrong
+  * Chris Lamb
+  * Cody Somerville
+  * Daniel Baumann
+  * intrigeri
+  * Kai Hendry
+  * Marco Amadori
+  * Otavio Salvador
+  * Richard Nelson
+
+<!-- alioth members
+Alex Owen
+Brendan Sleight
+Fathi Boudra
+Frank Lin Piat
+Frederic Daniel Luc Lehobey
+Mathieu GELI
+Michael Dorrington
+Vagrant Cascadian
+-->
 
 ## Task description
 

-- 
wiki-content