merge revision(s) 34190:

	* tool/merger.rb (#version_up): version.h date should be Japanese
	  locale date.


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

1 files changed, 2 insertions, 1 deletions

diff --git a/tool/merger.rb b/tool/merger.rb
index 48fddc38f2..a521b0ea16 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -58,7 +58,8 @@ def interactive str
 end
 
 def version_up
-  d = Date.today
+  d = DateTime.now
+  d = d.new_offset(Rational(9,24)) # we need server locale (i.e. japanese) time
   system *%w'svn revert version.h'
   v, p = version