import from sf

diff --cc ChangeLog
index a92359fbbd145306b4451e4e10a2f618474583fb,a10f825151cb3ab3dacfec8abc92993503b566c3..bc19ebc78cf7c9deb51ea06765dcb1a8f2b66fb9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,20 +1,24 @@@
  /***********************************************************************
  X3 ChangeLog
  
 +2010-03-15  Matthew Beeching  <jobe@mdbnet.co.uk>
 +
 +      * ChangeLog: Abusing to figure out mercurial a bit.
 +
+ 2010-03-13  Matthew Beeching  <jobe@mdbnet.co.uk>
+ 
+       * src/hash.h: Changed HOSTLEN to match Nefarious.
+ 
+ 2010-03-03  Matthew Beeching  <jobe@mdbnet.co.uk>
+ 
+       * src/proto-p10.c: Fixed bug in P10 B64 IPv6 parsing where the
+       entire IPv6 IP after the :: was ommited.
+ 
+ 2010-02-27  Matthew Beeching  <jobe@mdbnet.co.uk>
+ 
+       * src/proto-p10.c: Added message handlers for ZLINE and REMOVE
+       to ignore both messages
+ 
  2010-02-05  Matthew Beeching  <jobe@mdbnet.co.uk>
  
        * src/nickserv.help: Fix for a minor documentation error where $S