merge revision(s) 44373: [Backport #9417]

	test_alias.rb: rename duplicate name

	* test/ruby/test_alias.rb (test_alias_wb_miss): rename duplicate
  name to get rid of redefinition.

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

2 files changed, 2 insertions, 2 deletions

diff --git a/test/ruby/test_alias.rb b/test/ruby/test_alias.rb
index cef39d690f..956fdb41f0 100644
--- a/test/ruby/test_alias.rb
+++ b/test/ruby/test_alias.rb
@@ -121,7 +121,7 @@ class TestAlias < Test::Unit::TestCase
     assert_equal([:Base, :M], SuperInAliasedModuleMethod::Derived.new.bar)
   end
 
-  def test_alias
+  def test_alias_wb_miss
     assert_normal_exit %q{
       require 'stringio'
       GC.verify_internal_consistency
diff --git a/version.h b/version.h
index 1e17ddec77..1bc3dec1f1 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-01"
-#define RUBY_PATCHLEVEL 13
+#define RUBY_PATCHLEVEL 14
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2