X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ChangeLog;h=736291ddacd5f8e42b079e78969377d4e1c34f37;hb=500be22dee617f0d5d52dd2238348e7ad453ed43;hp=284284ef5e050914de71580f62aba99d7ba564f4;hpb=ce3cf0da7948e0922eb96c622afc5126326d73d7;p=ircu2.10.12-pk.git

diff --git a/ChangeLog b/ChangeLog
index 284284e..736291d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-03 Andrew Miller <a1kmm@mware.virtualave.net>
+	* doc/example.conf: Cleaned up some comments that ended up in
+	  strange places due to problems in the merge process.
+	* ircd/m_nick.c: Cleaned up ms_nick, and fixed a bug that
+	  probably dates back to Jarkko code.
+
 2002-04-02  Kevin L Mitchell  <klmitch@mit.edu>
 
 	* ircd/m_kill.c: let ms_kill() and mo_kill() seperate the message