[SCM] wiki-content branch, master, updated. 6f95c0684b394438cc46c0daa8ac1559d3d11991

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 6f95c0684b394438cc46c0daa8ac1559d3d11991
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Aug 6 15:58:48 2010 +0200

    Adding django live on project downstream page.

diff --git a/project/downstream.mdwn b/project/downstream.mdwn
index 88998ca..f80e334 100644
--- a/project/downstream.mdwn
+++ b/project/downstream.mdwn
@@ -34,6 +34,14 @@ More information:
 
   * [Homepage](http://pkg-kde.alioth.debian.org/kde4livecd.html)
 
+## Django Live
+
+[Django Live](http://sourceforge.net/projects/djangolive/) is a live system to ease the setup, hosting and testing of applications based on the Dijango Web framework.
+
+More information:
+
+  * [Homepage](http://sourceforge.net/projects/djangolive/)
+
 ## FAI - Fully Automatic Installation
 
 [FAI](http://www.informatik.uni-koeln.de/fai/) is a non-interactive system to install, customize and manage Linux systems and software configurations on computers as well as virtual machines and chroot environments, from small networks to large-scale infrastructures and clusters.

-- 
wiki-content