# 
# patch "ChangeLog"
#  from [a4e2cd7768c78ad715c7f5425977a48c6cb82eef]
#    to [00be67da78804afd4d1a75955b9b951e37c3ea2a]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,7 @@
+2005-04-16  Nathaniel Smith  <address@hidden>
+
+	* ChangeLog: Fixup after merge.
+
 2005-04-17  Matthew Gregan  <address@hidden>
 
 	* monotone.cc: Fix warnings: add missing initializers.
@@ -5,18 +9,6 @@
 
 2005-04-16  Nathaniel Smith  <address@hidden>
 
-	* testsuite.at: Use a random server port.
-	
-	* .mt-attrs, contrib/README: Update for Notify.pl ->
-	monotone-notify.pl rename.
-	
-	* monotone.1: Warn people off rcs_import.
-	* monotone.texi (Commands): Likewise.
-
-2005-04-16  Nathaniel Smith  <address@hidden>
-
-2005-04-16  Nathaniel Smith  <address@hidden>
-
 	* tests/t_update_nonexistent.at: New test.
 	* testsuite.at: Add it.