merge revision(s) r49752,r49753: [Backport ruby#10953]

	* spec/default.mspec: remove specific version number.
	  ruby/spec@7a909e9

	* spec/default.mspec: use default configuration file name.
	  ruby/spec@cc69f33


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

Author: nagachika

ChangeLog

@@ -1,3 +1,13 @@
+Mon Mar  9 22:30:50 2015  SHIBATA Hiroshi  <[email protected]>
+
+	* spec/default.mspec: use default configuration file name.
+	  https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf
+
+Mon Mar  9 22:30:50 2015  SHIBATA Hiroshi  <[email protected]>
+
+	* spec/default.mspec: remove specific version number.
+	  https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
+
 Mon Mar  9 22:27:47 2015  SHIBATA Hiroshi  <[email protected]>
 
 	* common.mk: use ruby organization for rubyspec.

spec/default.mspec

@@ -1,4 +1,4 @@
-load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec'
+load File.dirname(__FILE__) + '/rubyspec/default.mspec'
 class MSpecScript
   builddir = Dir.pwd
   srcdir = ENV['SRCDIR']

version.h

@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-03-09"
-#define RUBY_PATCHLEVEL 308
+#define RUBY_PATCHLEVEL 309
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3