commit | bb90d02a71c60bc16389fba4ff06965714b1826f | [log] [tgz] |
---|---|---|
author | Matt Caswell <matt@openssl.org> | Wed Feb 15 09:44:46 2017 +0000 |
committer | Matt Caswell <matt@openssl.org> | Wed Feb 15 10:50:39 2017 +0000 |
tree | 776c21167dd7d530ab35cfeee06113228b79998e | |
parent | a34a9df0712ac27256ec48e6f88c61064613ac08 [diff] |
Fix merge issue Causes make update to fail. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2634)