nagachika	2013-09-27 01:00:20 +0900 (Fri, 27 Sep 2013)

  New Revision: 43060

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

  Log:
    merge revision(s) 42994: [Backport #8913]
    
    * lib/gserver.rb: [DOC] correct gserver.rb license [Bug #8913]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/gserver.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 43059)
+++ ruby_2_0_0/ChangeLog	(revision 43060)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Fri Sep 27 00:58:57 2013  Zachary Scott  <e@z...>
+
+	* lib/gserver.rb: [DOC] correct gserver.rb license [Bug #8913]
+
 Sun Sep 15 23:15:32 2013  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* lib/rubygems: Update to Rubygems 2.0.9. [ruby-core:57183]
Index: ruby_2_0_0/lib/gserver.rb
===================================================================
--- ruby_2_0_0/lib/gserver.rb	(revision 43059)
+++ ruby_2_0_0/lib/gserver.rb	(revision 43060)
@@ -3,7 +3,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/gserver.rb#L3
 #
 # Author::        John W. Small
 # Documentation:: Gavin Sinclair
-# Licence::       Freeware.
+# Licence::       Ruby License
 
 require "socket"
 require "thread"
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43059)
+++ ruby_2_0_0/version.h	(revision 43060)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-09-15"
-#define RUBY_PATCHLEVEL 317
+#define RUBY_RELEASE_DATE "2013-09-27"
+#define RUBY_PATCHLEVEL 318
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42994


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