naruse	2013-12-22 19:22:40 +0900 (Sun, 22 Dec 2013)

  New Revision: 44343

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44343

  Log:
    merge revision(s) 44331: [Backport #9280]
    
    * lib/rubygems.rb:  Set RubyGems to release version.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/rubygems.rb
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 44342)
+++ ruby_2_1/ChangeLog	(revision 44343)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Dec 22 19:22:31 2013  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems.rb:  Set RubyGems to release version.
+
 Sun Dec 22 19:22:01 2013  Eric Hodel  <drbrain@s...>
 
 	* lib/rubygems.rb (module Gem):  Fix comment for
Index: ruby_2_1/lib/rubygems.rb
===================================================================
--- ruby_2_1/lib/rubygems.rb	(revision 44342)
+++ ruby_2_1/lib/rubygems.rb	(revision 44343)
@@ -8,7 +8,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/rubygems.rb#L8
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.2.0.rc.1'
+  VERSION = '2.2.0'
 end
 
 # Must be first since it unloads the prelude from 1.9.2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44331


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/