merge revision(s) 39425:

	merger.rb: runnable

	* tool/merger.rb: make runnable.

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

2 files changed, 5 insertions, 2 deletions

diff --git a/tool/merger.rb b/tool/merger.rb
index 419ccb71f2..82f43aac6e 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -1,4 +1,7 @@
-#! /bin/ruby
+#!/bin/sh
+# -*- ruby -*-
+exec "${RUBY-ruby}" "-x" "$0" "$@" && [ ] if false
+#!ruby
 # This needs ruby 1.9 and subversion.
 # run this in a repository to commit.
 
diff --git a/version.h b/version.h
index 21d01de656..1c1725b5d8 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 37
+#define RUBY_PATCHLEVEL 38
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3