Merge 3.0 fixes.

diff --cc Makefile
Simple merge

diff --cc NEWS
index 7e96a8fc3c054a6ec583d6a7170ca7b465c87424,51792c9988a9ed5035398abeab3d55aa2772f01b..e4ab494e5f5b5e5ba91699b95a68753aa3d0a893
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,16 -5,25 +5,35 @@@ Ctrlproxy 3.0.1 UNRELEASE
  
    BUG FIXES
  
 -   * Fixed bug in administration command (reported by Daniel Poelzleithner)
 +    * Logging for network state information has been simplified and been 
 +        made less verbose.
  
 -   * Fix invalid assert in auto-away (reported by Daniel Poelzleithner)
 +      * 324 and 329 replies are now cached.
 +
 +      * 352 and 315 replies are now (optionally) cached. The "max_who_age" 
 +        setting can be set to the number of seconds that results should be cached.
 +        This prevents "Excess Flood" errors when connecting using several xchat clients
 +        at once.
 +
++    * Fixed bug in administration command (reported by Daniel Poelzleithner)
++
++    * Fix invalid assert in auto-away (reported by Daniel Poelzleithner)
+ 
+   PORTABILITY
+   
 -   * Added replacement functions for g_file_{set,get}_contents, for those 
 -     with GLib < 2.8
++    * Added replacement functions for g_file_{set,get}_contents, for those 
++      with GLib < 2.8
+     
+   DOCUMENTATION UPDATES
+ 
 -   * Updated command documentation
++    * Updated command documentation
+ 
 -   * Updated requirements
++    * Updated requirements
+ 
+   MINOR CHANGES
+ 
 -   * Fixed several warnings
++    * Fixed several warnings
+ 
  Ctrlproxy 3.0 2006-12-08
  
    This list is not complete. Several subsystems in ctrlproxy have been 

diff --cc src/ctrlproxy.h
Simple merge

diff --cc src/linestack_file.c
Simple merge