1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c4f9918ae..9c487055d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 17 16:24:10 2015  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (strptime): Support %s.%N.
+	  [ruby-core:68301] [Bug #10904] Patch by Sadayuki Furuhashi.
+
 Mon Aug 17 16:22:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* transcode.c (load_transcoder_entry): fix transcoder loading race