From 9369118f8f4ed02c76839c6a67c268a2de9acde9 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Feb 2007 11:51:55 +0000
Subject: Merge changes between r11871 and r11907 from ruby_1_8.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@11908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/base64.rb               | 2 +-
 lib/test/unit/autorunner.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/base64.rb b/lib/base64.rb
index 410d76ffcd..05be9ddf78 100644
--- a/lib/base64.rb
+++ b/lib/base64.rb
@@ -102,7 +102,7 @@ module Base64
   #
   #    require 'base64'
   #    data = "Now is the time for all good coders\nto learn Ruby" 
-  #    puts Base64.b64encode(data)
+  #    Base64.b64encode(data)
   #
   # <i>Generates:</i>
   #
diff --git a/lib/test/unit/autorunner.rb b/lib/test/unit/autorunner.rb
index dadf080d12..86c9b12940 100644
--- a/lib/test/unit/autorunner.rb
+++ b/lib/test/unit/autorunner.rb
@@ -81,6 +81,7 @@ module Test
         @filters = []
         @to_run = []
         @output_level = UI::NORMAL
+        @workdir = nil
         yield(self) if(block_given?)
       end
 
-- 
cgit v1.2.3