[SCM] wiki-content branch, master, updated. 3bb60ef9f4444faef28d18bbfc054a692d46deee

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 78dca4349f73e60ab186e84979f43c9f06f95046
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 1 23:08:14 2011 +0200

    Adding entry about meeting at debconf 2011.

diff --git a/project/news.mdwn b/project/news.mdwn
index 0aed744..4bdf541 100644
--- a/project/news.mdwn
+++ b/project/news.mdwn
@@ -2,6 +2,9 @@
 
 ## 2011
 
+  * 2010-07-21: [Debian Live Team Members meet at DebConf 12 in Banja Luka, Bosnia Herzegovina](http://live.debian.net/archive/meetings/2011-debconf/)<br />
+    Members of the Debian Live Team have met at the annual Debian Conference.
+
   * 2011-03-24: [Debian Live Squeeze 6.0.1](http://live.debian.net/cdimage/release/6.0.1/)<br />
     Debian Squeeze 6.0.1 was released.
 

-- 
wiki-content