Merge 3.0.4.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 24 Nov 2007 19:06:50 +0000 (20:06 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 24 Nov 2007 19:06:50 +0000 (20:06 +0100)
1  2 
NEWS

diff --cc NEWS
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,15 -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