1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5edeb82b2..317dd2c46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@
 - (djm) [ed25519.c ssh-ed25519.c openbsd-compat/Makefile.in]
   [openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on
   Linux
+ - (djm) [regress/cert-hostkey.sh] Fix merge botch
 20131205
 - (djm) OpenBSD CVS Sync

diff --git a/ChangeLog b/ChangeLog index 5edeb82b2..317dd2c46 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -48,6 +48,7 @@
48	- (djm) [ed25519.c ssh-ed25519.c openbsd-compat/Makefile.in]	48	- (djm) [ed25519.c ssh-ed25519.c openbsd-compat/Makefile.in]
49	[openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on	49	[openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on
50	Linux	50	Linux
		51	- (djm) [regress/cert-hostkey.sh] Fix merge botch
51		52
52	20131205	53	20131205
53	- (djm) OpenBSD CVS Sync	54	- (djm) OpenBSD CVS Sync