merge revision(s) 40913: [Backport #8434]

	* intern.h: remove dangling rb_class_init_copy declaration
	  [ruby-core:55120] [Bug #8434]


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

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 53b934319c..0fa7df9291 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun  9 01:38:55 2013  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* intern.h: remove dangling rb_class_init_copy declaration
+	  [ruby-core:55120] [Bug #8434]
+
 Sun Jun  9 01:30:57 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/net/imap.rb (capability_response): should ignore trailing
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index 3ffb05c933..27916917bd 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -172,7 +172,6 @@ VALUE rb_Complex(VALUE, VALUE);
 VALUE rb_class_boot(VALUE);
 VALUE rb_class_new(VALUE);
 VALUE rb_mod_init_copy(VALUE, VALUE);
-VALUE rb_class_init_copy(VALUE, VALUE);
 VALUE rb_singleton_class_clone(VALUE);
 void rb_singleton_class_attached(VALUE,VALUE);
 VALUE rb_make_metaclass(VALUE, VALUE);
diff --git a/version.h b/version.h
index 6b42cce794..3b7c056b6e 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-06-09"
-#define RUBY_PATCHLEVEL 210
+#define RUBY_PATCHLEVEL 211
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6