merges r30798 from trunk into ruby_1_9_2.

--
* lib/test/unit/assertions.rb (assert_block): move from
  test/fileutils/fileasserts.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 03cfc01b87..8e911ab5fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -472,7 +472,10 @@ Sun May  1 18:35:34 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 	* test/fileutils/fileasserts.rb (assert_block): little workaround
 	  for [ruby-dev:43174].
 
-Sat Feb  5 20:40:34 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb  5 21:22:21 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/assertions.rb (assert_block): move from
+	  test/fileutils/fileasserts.rb.
 
 	* test/fileutils/fileasserts.rb (assert_block): pass arguments
 	  as-is.  [ruby-dev:43174]
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index f4e4e74e1e..d375e3de85 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -19,6 +19,10 @@ module Test
         super
       end
 
+      def assert_block(*msgs)
+        assert yield, *msgs
+      end
+
       def assert_raise(*args, &b)
         assert_raises(*args, &b)
       end
diff --git a/version.h b/version.h
index 14d6cb3211..536994e91e 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 266
+#define RUBY_PATCHLEVEL 267
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1