From eae88744662e6b149f43ef071657727f1a157d95 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 27 May 2014 14:27:02 +1000
Subject:  - (djm) [cipher.c] Fix merge botch.

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index fe00d03ca..da8a14114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20140527
+ - (djm) [cipher.c] Fix merge botch.
+
 20140522
  - (djm) [Makefile.in] typo in path
 
-- 
cgit v1.2.3