diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 15:37:52 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-18 15:37:52 +0000 |
| commit | bd210ff16425ab92aef0ca4ac5a28061fac7c154 (patch) | |
| tree | 328a46c315bbd6de1d2e5b364f36c38adb9690ae /ChangeLog | |
| parent | 0181fbc4dee797bd704f1ae2b6827dd3caae64e2 (diff) | |
merge revision(s) 52556,52557: [Backport #10735]
* ext/openssl/ossl_pkey.c: Merge ruby/openssl@b9ea8ef [Bug #10735]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Thu Nov 19 00:15:23 2015 Zachary Scott <zzak@ruby-lang.org> + + * ext/openssl/ossl_pkey.c: Merge ruby/openssl@b9ea8ef [Bug #10735] + Thu Nov 19 00:01:14 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (argf_next_argv): check ARGV element type, and try |