usa	2014-01-31 21:58:39 +0900 (Fri, 31 Jan 2014)

  New Revision: 44779

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

  Log:
    fixed merge mistake at r44766.

  Modified files:
    branches/ruby_1_9_3/process.c
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/process.c
===================================================================
--- ruby_1_9_3/process.c	(revision 44778)
+++ ruby_1_9_3/process.c	(revision 44779)
@@ -4915,13 +4915,14 @@ rb_daemon(int nochdir, int noclose) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/process.c#L4915
     before_fork();
     err = daemon(nochdir, noclose);
     after_fork();
+    rb_thread_atfork();
 #else
     int n;
 
 #define fork_daemon() \
     switch (rb_fork(0, 0, 0, Qnil)) { \
       case -1: return -1; \
-      case 0:  break; \
+      case 0:  rb_thread_atfork(); break; \
       default: _exit(EXIT_SUCCESS); \
     }
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 44778)
+++ ruby_1_9_3/version.h	(revision 44779)
@@ -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 510
+#define RUBY_PATCHLEVEL 511
 
-#define RUBY_RELEASE_DATE "2014-01-30"
+#define RUBY_RELEASE_DATE "2014-01-31"
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_DAY 31
 
 #include "ruby/version.h"
 

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