# 
# 
# patch "ChangeLog"
#  from [7119822a8b01853dcadc7cc8eec4347fb3e9c179]
#    to [b56787153e24a6030529ba19ac4f1caaa7b48caf]
# 
# patch "NEWS"
#  from [113cf5d13bd4139faaf4dce9d4f1c730a82b2556]
#    to [12599d363aa561245f47a96a7464a51a705cd2b2]
# 
# patch "UPGRADE"
#  from [948a40e7ad0f031a33b997d2b0732519633b0af5]
#    to [90118ba05f6a466d3f304f63563a977a67748c74]
# 
============================================================
--- ChangeLog	7119822a8b01853dcadc7cc8eec4347fb3e9c179
+++ ChangeLog	b56787153e24a6030529ba19ac4f1caaa7b48caf
@@ -1,5 +1,11 @@
 2006-03-04  Nathaniel Smith  <address@hidden>
 
+	* NEWS: Oops, apparently 0.25.1 is taken.  Call this 0.25.2, and
+	add a note about why it isn't 0.25.1.
+	* UPGRADE: Similarly correct version number.
+	
+2006-03-04  Nathaniel Smith  <address@hidden>
+
 	* NEWS: Draft NEWS for 0.25.1 security release.
 
 2006-03-04  Nathaniel Smith  <address@hidden>
============================================================
--- NEWS	113cf5d13bd4139faaf4dce9d4f1c730a82b2556
+++ NEWS	12599d363aa561245f47a96a7464a51a705cd2b2
@@ -1,6 +1,6 @@
 ????????????????????????????
 
-        0.25.1 release.  Important security fix for Windows and OS X
+        0.25.2 release.  Important security fix for Windows and OS X
         users.
 
         With versions of monotone prior to this release, a person with
@@ -20,6 +20,11 @@
         serving, or only on case-insensitive filesystems (i.e., most
         Unix users), are not affected.
 
+        (0.25.1 was never released in source form.  The original
+        0.25 build for Windows was found to have problems on NT 4, and
+        0.25.1 was Windows-only rebuild with NT 4 compatible
+        libraries.)
+
 Thu Dec 29 23:10:03 PST 2005
 
         0.25 release.
============================================================
--- UPGRADE	948a40e7ad0f031a33b997d2b0732519633b0af5
+++ UPGRADE	90118ba05f6a466d3f304f63563a977a67748c74
@@ -1,4 +1,4 @@
-upgrading monotone to 0.25.1
+upgrading monotone to 0.25.2
 ============================
 
 if you are upgrading from: