and Igor Franchuk is his name!

diff --git a/CHANGES b/CHANGES
index fb299037b30a8dfdc918d499fe9ccfe8ce7d8f2c..939f58ce584ca689a0cfb09c5d9324898fa70bae 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,16 +6,13 @@
 
                                   Changelog
 
-<<<<<<< CHANGES
 Daniel S (23 Jan 2008)
-- "Igor" pointed out that CURLOPT_COOKIELIST set to "ALL" leaked memory, and so
-  did "SESS". Fixed now.
+- Igor Franchuk pointed out that CURLOPT_COOKIELIST set to "ALL" leaked
+  memory, and so did "SESS". Fixed now.
 
-=======
 Yang Tse (22 Jan 2008)
 - Check poll.h at configuration time, and use it when sys/poll.h unavailable
 
->>>>>>> 1.1234
 Daniel S (22 Jan 2008)
 - Dmitry Kurochkin removed the cancelled state for pipelining, as we agreed
   that it is bad anyway. Starting now, removing a handle that is in used in a

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ae8b86b4d8147e0e11a7fe689016b212d7572b8e..4cce7aa144c58a6294cf24a29d53d53e3511177d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -86,6 +86,6 @@ advice from friends like these:
  Gilles Blanc, David Wright, Vikram Saxena, Mateusz Loskot, Gary Maxwell,
  Dmitry Kurochkin, Mohun Biswas, Richard Atterer, Maxim Perenesenko,
  Daniel Egger, Jeff Johnson, Nikitinskit Dmitriy, Georg Lippitsch, Eric Landes,
- Joe Malicki, Nathan Coulter, Lau Hang Kin, Judson Bishop
+ Joe Malicki, Nathan Coulter, Lau Hang Kin, Judson Bishop, Igor Franchuk
  
         Thanks! (and sorry if I forgot to mention someone)