From 47f56def29583ba4f85ecffb4e6da62c9d8999af Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 4 Dec 2008 08:56:20 +0000
Subject: [PATCH] merges r20492 from trunk into ruby_1_9_1. * lib/gserver.rb:
 fixed type in sample code.  a report from Oleg   Puchinin.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 5 +++++
 lib/gserver.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 51ea853ded..6f31deafac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  4 16:16:09 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/gserver.rb: fixed type in sample code.  a report from Oleg
+	  Puchinin.
+
 Thu Dec  4 14:54:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rubygems/local_remote_options.rb (Gem#add_update_sources_option): 
diff --git a/lib/gserver.rb b/lib/gserver.rb
index eb5f31b7b3..592e8661fe 100644
--- a/lib/gserver.rb
+++ b/lib/gserver.rb
@@ -40,7 +40,7 @@ require "thread"
 #       super(port, *args)
 #     end
 #     def serve(io)
-#       io.puts(Time.now.to_i)
+#       io.puts(Time.now.to_s)
 #     end
 #   end
 #