1 files changed, 3 insertions, 0 deletions
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

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