From 198aac595092e55a10cb458151556492a985b734 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 12 Mar 2017 16:29:12 +0000
Subject: [PATCH] merge revision(s) 57777:

	rdoc for String class

	* lib/unicode_normalize.rb: [DOC] prevent a comment from
	  showing up in the class documentation for String.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/unicode_normalize.rb | 2 ++
 version.h                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/unicode_normalize.rb b/lib/unicode_normalize.rb
index 8daf7b301a..72478fade3 100644
--- a/lib/unicode_normalize.rb
+++ b/lib/unicode_normalize.rb
@@ -3,7 +3,9 @@
 
 # Copyright Ayumu Nojima (野島 歩) and Martin J. Dürst (duerst@it.aoyama.ac.jp)
 
+#--
 # additions to class String for Unicode normalization
+#++
 class String
   # === Unicode Normalization
   #
diff --git a/version.h b/version.h
index 41b9a7381d..42cb9c5233 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-13"
-#define RUBY_PATCHLEVEL 82
+#define RUBY_PATCHLEVEL 83
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3