merge revision(s) 47196: [Backport #10144]

	* time.c (time_timespec): fix tv_nsec overflow
	  [Bug #10144]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f945746e8..bf87be6377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 10 12:25:24 2014  Eric Wong  <e@80x24.org>
+
+	* time.c (time_timespec): fix tv_nsec overflow
+	  [Bug #10144]
+
 Wed Sep 10 12:21:51 2014  Eric Wong  <e@80x24.org>
 
 	* ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE