merge revision(s) 49531:

	test_dir_m17n.rb: fix tests

	* test/ruby/test_dir_m17n.rb (with_enc_path): test with UTF-8
  default external encoding for non-locale environments.

	* test/ruby/test_dir_m17n.rb (test_glob_warning_opendir): valid
  only if file permissions work.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/version.h b/version.h
index e2e468a273..ca21162db1 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-02-24"
-#define RUBY_PATCHLEVEL 82
+#define RUBY_PATCHLEVEL 83
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 2