From 37834afe7be91de1aff4bdffbef2c54797ec58d6 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 12 Dec 2012 11:00:37 +1100 Subject: - (djm) [mac.c] fix merge botch --- ChangeLog | 1 + 1 file changed, 1 insertion(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 05a3b078d..ed58d1ced 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ - markus@cvs.openbsd.org 2012/12/11 23:12:13 [try-ciphers.sh] add hmac-ripemd160-etm@openssh.com + - (djm) [mac.c] fix merge botch 20121207 - (dtucker) OpenBSD CVS Sync -- cgit v1.2.3