usa	2013-08-16 15:36:35 +0900 (Fri, 16 Aug 2013)

  New Revision: 42581

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

  Log:
    merge revision(s) 36620: [Backport #8791]
    
    * ext/date/date_{core,strftime}.c: [ruby-core:46990].

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/date/date_core.c
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 42580)
+++ ruby_1_9_3/ChangeLog	(revision 42581)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Aug 16 15:35:10 2013  Tadayoshi Funaba  <tadf@d...>
+
+	* ext/date/date_{core,strftime}.c: [ruby-core:46990].
+
 Wed Aug 14 09:56:55 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (have_framework): allow header file to check.
Index: ruby_1_9_3/ext/date/date_core.c
===================================================================
--- ruby_1_9_3/ext/date/date_core.c	(revision 42580)
+++ ruby_1_9_3/ext/date/date_core.c	(revision 42581)
@@ -7030,7 +7030,7 @@ date_strftime_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/date/date_core.c#L7030
  *
  *    Seconds since the Unix Epoch:
  *      %s - Number of seconds since 1970-01-01 00:00:00 UTC.
- *      %Q - Number of microseconds since 1970-01-01 00:00:00 UTC.
+ *      %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC.
  *
  *    Literal string:
  *      %n - Newline character (\n)
@@ -8465,7 +8465,7 @@ dt_lite_to_s(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/date/date_core.c#L8465
  *
  *    Seconds since the Unix Epoch:
  *      %s - Number of seconds since 1970-01-01 00:00:00 UTC.
- *      %Q - Number of microseconds since 1970-01-01 00:00:00 UTC.
+ *      %Q - Number of milliseconds since 1970-01-01 00:00:00 UTC.
  *
  *    Literal string:
  *      %n - Newline character (\n)
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 42580)
+++ ruby_1_9_3/version.h	(revision 42581)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 465
+#define RUBY_PATCHLEVEL 466
 
-#define RUBY_RELEASE_DATE "2013-08-14"
+#define RUBY_RELEASE_DATE "2013-08-16"
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 16
 
 #include "ruby/version.h"
 

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36620


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