From 4a722bd73aabe679943ababa549ea44a0275c64d Mon Sep 17 00:00:00 2001
From: ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 25 Dec 2010 04:24:37 +0000
Subject: Dunno why this conflicted

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

diff --git a/ChangeLog b/ChangeLog
index 32aef992b8..b7dfc449e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -242,6 +242,10 @@ Thu Dec 16 08:04:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* iseq.c (set_relation), vm_insnhelper.c (vm_cref_push): nd_file
 	  is always zero-cleared.
 
+Thu Dec 16 07:22:30 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	* lib/minitest/unit.rb: Imported minitest 2.0.1 r6079.
+
 Wed Dec 15 20:45:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/test/unit.rb (process_args): need to setup @help to print options.
-- 
cgit v1.2.3