Merge commit 'ftpmaster/master'

[dak.git] / web / index.html

diff --git a/web/index.html b/web/index.html
index 7e3ca97c8310c824ea3fc3d73b6400a9c370fb0d..1597e126583eb5ebd9088b0bf5b8719698e125d1 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -68,12 +68,11 @@
             <p>The members of ftpmaster currently are divided into two groups, FTP Master and FTP Assistants.</p>
             <p>Members of FTP Master are:</p>
             <ul>
-                <li>Ryan Murray</li>
                 <li>Joerg Jaspert</li>
+                <li>Mark Hymers</li>
             </ul>
             <p>The FTP Assistants are:</p>
             <ul>
-                <li>Mark Hymers</li>
                 <li>Kalle Kivimaa</li>
                                <li>Frank Lichtenheld</li>
                                <li>Mike O'Connor</li>
@@ -156,7 +155,7 @@
 
         <div id="testing">
             <h1>Testing</h1>
-            <p>Lenny is testing, sid is unstable. For more details please look
+            <p>Squeeze is testing, sid is unstable. For more details please look
             at the <a href="http://www.debian.org/devel/testing">testing</a> pages.</p>
         </div>