merge revision(s) 33215:

	* test/rexml/test_encoding.rb:
	  Add require 'require 'rexml/document'


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

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 55081076db..1e89813963 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 12 13:56:01 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/rexml/test_encoding.rb:
+	  Add require 'require 'rexml/document'
+
 Fri Oct 12 13:36:32 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* numeric.c (flodivmod): must through the same pass if HAVE_FMOD or not.
diff --git a/test/rexml/test_encoding.rb b/test/rexml/test_encoding.rb
index e359914b36..8b93460e6c 100644
--- a/test/rexml/test_encoding.rb
+++ b/test/rexml/test_encoding.rb
@@ -3,6 +3,7 @@
 require "rexml_test_utils"
 
 require 'rexml/source'
+require 'rexml/document'
 
 class EncodingTester < Test::Unit::TestCase
   include REXMLTestUtils
diff --git a/version.h b/version.h
index 6c1dda48d0..20aec4881d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 281
+#define RUBY_PATCHLEVEL 282
 
 #define RUBY_RELEASE_DATE "2012-10-12"
 #define RUBY_RELEASE_YEAR 2012