[SCM] wiki-content branch, master, updated. 622e29dbd5ce5639b06cf77fc61f8bb4cc72612d

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 622e29dbd5ce5639b06cf77fc61f8bb4cc72612d
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jun 11 19:39:59 2011 +0200

    Removing live-studio stub, doesn't look like that gets uploaded to debian.

diff --git a/devel/live-studio.mdwn b/devel/live-studio.mdwn
deleted file mode 100644
index 72d41c7..0000000
--- a/devel/live-studio.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-# live-studio - Web based front-end
-
-## About
-
-live-studio is a web frontend to the Debian Live tools. It offers users of any operating system to customise, build and then download a Debian Live system from anywhere on the internet. Configurations can be recalled on subsequent visits.
-
-## News
-
-  * 2010-??-??: Uploading initial version to debian (x.y.z-a).
-
-## Links
-
-  * [Debian Bug Tracking System](http://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=no&src=live-studio)
-  * [Debian Package Tracking System](http://packages.qa.debian.org/l/live-studio.html)
-  * [Package Archive](http://live.debian.net/archive/packages/live-studio/)
-  * [Git Statistics](stats)
-
-## Contact
-
-  * [Debian Live Mailing List](http://lists.debian.org/debian-live/): [debian-live at lists.debian.org](debian-live at lists.debian.org)
-  * [Debian Live IRC Channel](http://live.debian.net/archive/irc/): [irc://irc.debian.org/debian-live](irc://irc.debian.org/debian-live) (OFTC)
-
-## Source
-
-The sources of live-studio are released under the terms of the GNU Affero General Public License 3 (or later), and available in a git repository at live.debian.net.
-
-  * Browse: [http://live.debian.net/gitweb/?p=live-studio.git](http://live.debian.net/gitweb/?p=live-studio.git)
-  * Git: [git://live.debian.net/git/live-studio.git](git://live.debian.net/git/live-studio.git)
diff --git a/index.mdwn b/index.mdwn
index 975b346..8ddf009 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -23,7 +23,6 @@
 		<li><a href="./devel/live-config/">live-config</a></li>
 		<li><a href="./devel/live-installer/">live-installer</a></li>
 		<li><a href="./devel/live-manual/">live-manual</a></li>
-		<li><a href="./devel/live-studio/">live-studio</a></li>
 		<li><a href="./devel/live-tools/">live-tools</a></li>
 		<li><a href="./devel/other/">other</a></li>
 		<li><a href="./devel/rfc/">RFC</a></li>

-- 
wiki-content