ryan	2010-12-25 13:24:37 +0900 (Sat, 25 Dec 2010)

  New Revision: 30345

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30345

  Log:
    Dunno why this conflicted

  Modified files:
    trunk/ChangeLog

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30344)
+++ ChangeLog	(revision 30345)
@@ -242,6 +242,10 @@
 	* 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@z...>
+
+	* lib/minitest/unit.rb: Imported minitest 2.0.1 r6079.
+
 Wed Dec 15 20:45:02 2010  NAKAMURA Usaku  <usa@r...>
 
 	* lib/test/unit.rb (process_args): need to setup @help to print options.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/