From 9edcd5d16bbde5f07022fff25bb68b536b2fcd21 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 11 Sep 2009 01:47:12 +0000
Subject: resolve conflict.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 03c64fbd5d..c6da78cc4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 11 10:38:33 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTPHeader::encode_kvpair): also call to_s
+	  to k.  A patch from swdyh <youhei@gmail.com>
+	  http://github.com/swdyh/ruby/tree/c847f43c2ccb679b9ff728f8b1b16c6ceeb57f39
+
 Fri Sep 11 09:45:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dln.c (aix_loaderror): get rid of using uninitialized value in the
-- 
cgit v1.2.3