Merge 3.0.4.
[jelmer/ctrlproxy.git] / NEWS
diff --git a/NEWS b/NEWS
index e10e3840f0248e5f33483bea112525329c916afd..7e08cc37fa4503c900841a52ef9f4bf333ca6f06 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,15 @@
  Otherwise indicated differently, all changes made by 
      Jelmer Vernooij.
 
-Ctrlproxy 3.0.4 UNRELEASED
+Ctrlproxy 3.0.5 UNRELEASED
+
+  IMPROVEMENTS
+  
+    * Integrate auto-away module into the core.
+
+       * New settings ``autosave'', ``replication''
+
+Ctrlproxy 3.0.4 2007-11-24
 
   IMPROVEMENTS
 
@@ -17,6 +25,8 @@ Ctrlproxy 3.0.4 UNRELEASED
     * Add "default-network" setting.
 
   BUG FIXES
+    
+    * Don't allow disconnect of admin network. (#164)
 
     * Clearer error messages during disconnect.