[DRE-commits] [SCM] ruby-minitest.git branch, master, updated. upstream/2.6.1-16-gdce7f11

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit e9b0a9458fbbd4958d603e571b9c68de88c85ea0
Merge: afd9b1cda35fd7f7c4e3fc5fb41b8fc8ea4f5745 1b9098d42304f23b34dc157f718998320c3cc69d
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Tue Dec 20 20:26:00 2011 +0100

    Merge commit 'upstream/2.9.1'
    
    Conflicts:
    	History.txt
    	README.txt
    	data.tar.gz.sig
    	lib/hoe/minitest.rb
    	lib/minitest/mock.rb
    	lib/minitest/pride.rb
    	lib/minitest/spec.rb
    	lib/minitest/unit.rb
    	metadata.gz.sig
    	metadata.yml
    	test/test_minitest_mock.rb
    	test/test_minitest_spec.rb
    	test/test_minitest_unit.rb


-- 
ruby-minitest.git