usa	2013-04-11 11:19:39 +0900 (Thu, 11 Apr 2013)

  New Revision: 40227

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

  Log:
    merge revision(s) 39475: [Backport #7868]
    
    * ext/date/date_core.c: [ruby-core:52303]

  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 40226)
+++ ruby_1_9_3/ChangeLog	(revision 40227)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Thu Apr 11 11:18:57 2013  Tadayoshi Funaba  <tadf@d...>
+
+	* ext/date/date_core.c: [ruby-core:52303]
+
 Thu Apr  4 16:21:39 2013  NAKAMURA Usaku  <usa@r...>
 
 	* ext/objspace/objspace.c (count_nodes): fix key for unknown node.
Index: ruby_1_9_3/ext/date/date_core.c
===================================================================
--- ruby_1_9_3/ext/date/date_core.c	(revision 40226)
+++ ruby_1_9_3/ext/date/date_core.c	(revision 40227)
@@ -7864,7 +7864,7 @@ datetime_s_now(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/date/date_core.c#L7864
     of = tm.tm_gmtoff;
 #elif defined(HAVE_VAR_TIMEZONE)
 #ifdef HAVE_VAR_ALTZONE
-    of = (long)((tm.tm_isdst > 0) ? altzone : timezone);
+    of = (long)-((tm.tm_isdst > 0) ? altzone : timezone);
 #else
     of = (long)-timezone;
     if (tm.tm_isdst) {
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 40226)
+++ ruby_1_9_3/version.h	(revision 40227)
@@ -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 411
+#define RUBY_PATCHLEVEL 412
 
-#define RUBY_RELEASE_DATE "2013-04-09"
+#define RUBY_RELEASE_DATE "2013-04-11"
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 

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


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