1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 44dd365286..e2cca08c03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue May 31 17:28:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Completion.candidate): get rid of
+	  nil as key names.  [ruby-core:75773] [Bug #12438]
+
+	* lib/optparse.rb (OptionParser#make_switch): char class option
+	  cannot be NoArgument, default to RequiredArgument.
+
 Tue May 31 00:30:11 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/socket/raddrinfo.c (host_str, port_str): Use StringValueCStr