Merge 3.0 branch, start working on 3.0.3

diff --cc NEWS
index 0aec1447a540c044990abfab231e6992275b7a63,c194c2735d3bbe24ff78fe2adb4e28143c901eba..85c7e5211622bb25b6406dab2d33ed0004fa26ac
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,100 -1,13 +1,108 @@@
   Otherwise indicated differently, all changes made by 
        Jelmer Vernooij.
  
 -Ctrlproxy 3.0.2 UNRELEASED
++Ctrlproxy 3.0.3 UNRELEASED
+ 
+   PORTABILITY
+     
+     * Include netinet/in.h in src/utils.c and src/network.c. Required 
+         for building on FreeBSD. Reported by underlig.
+ 
++
 +Ctrlproxy 3.0.2 2007-04-15
 +
 +  BUG FIXES
 +
 +    * Support redirecting 396, 318, 437 and 330 replies. (#84)
 +
 +      * Fixed redirect warnings for 251, 252, 253, 254, 265 and 266.
 +
 +    * Don't abort when trying to send auto-AWAY while network is 
 +        disconnected.
 +
 +      * Handle CTRLPROXY command without any arguments. (#92)
 +
 +    * Fixed crash when using SSL support. (#83)
 +
 +      * Add support for storing topic set time and topic set by nick (#97).
 +
 +      * Fixed CTCP source reply URL. (#86)
 +
 +      * Hide assertion in g_key_file_free in free_config when a network has no associated file (patch by exg)
 +
 +      * Fix coredump with --init when the default config cannot be opened (patch by exg)
 +
 +      * Fix crash when CHARSET command fails (#89, #96)
 +
 +      * Fall back to default charset if client charset can't be set 
 +              (patch by Emanuele Giaquinta <e.giaquinta@glauco.it>)
 +
 +      * Fix use of %S segfault in log_custom. (#111)
 +
 +      * 005-lines are now forwarded to the end-client in a more 
 +      structural manner. (#94)
 +      
 +      * Properly expand target in log_irssi if it is a comma-separated list (#9)
 +        (based on patch by Korbinian Rosenegger)
 +
 +    * Properly expand target in log_custom if it is a comma-separated list (#9)
 +        (patch by Emanuele Giaquinta and Korbinian Rosenegger)
 +
 +      * Don't append extra colon before RPL_TOPICWHOTIME (Korbinian Rosenegger)
 +
 +      * Adding timed backlog in BACKLOG command without a channel 
 +        (Korbinian Rosenegger)
 +
 +      * Handle disconnects of clients properly (#108)
 +
 +      * Fix handling of non-UTF8 characters in linestack_file.
 +
 +      * Don't use CHARSETs by default (#117).
 +
 +      * Never send origin to the server (#122).
 +
 +      * Added support for 307 responses. 
 +
 +  FEATURES
 +
 +    * More advanced help support
 +
 +      * Add LOG_LEVEL command (#101)
 +
 +      * Add 'make uninstall' (#95)
 +
 +      * Do some more config checking (#102)
 +
 +      * Show disconnect reason in admin network (#100)
 +
 +      * Add support for handling additional 005 parameters: MAXCHANNELS,
 +              NICKLEN, MAXBANS, MODES, NICKLEN, MAXBANS, TOPICLEN, KICKLEN, 
 +              AWAYLEN, MAXTARGETS, WALLCHOPS, WALLVOICES, RFC2812, PENALTY,
 +              FNC, SAFELIST, USERIP, CNOTICE, KNOCK, VCHANNELS, WHOX, CALLERID,
 +              ACCEPT, KEYLEN, USERLEN, HOSTLEN, MAXCHANNELLEN, 
 +              MAXNICKLEN, DEAF, ELIST, MAXPARA, NAMESX, SECURELIST, WATCH
 +              REMOVE, MAP, OVERRIDE, VBANLIST and SILENCE
 +
 +      * Print actual address that a listener bound to.
 +
 +  INTERNALS
 +
 +    * Remove is_private from line struct (#12).
 +              (patch by Emanuele Giaquinta <e.giaquinta@glauco.it>)
 +
 +      * Implement ISON, USERHOST, WHO, WHOIS, JOIN, PART, AWAY for admin networks. (#99)
 +
 +  PORTABILITY
 +
 +    * Looks for check using pkg-config now.
 +
 +    * Fix handling of addresses when listening on FreeBSD. (#87)
 +
 +  DOCUMENTATION
 +      
 +      * Added more documentation to the help system. (#106)
 +
 +
  Ctrlproxy 3.0.1 2007-01-04
  
    BUG FIXES

diff --cc configure.ac
Simple merge

diff --cc src/internals.h
Simple merge