From 46f8520e36af40c06d47f978838ee86858caa474 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 06:03:37 +0100
Subject: Merging upstream version 1.4.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 900ecf1..eac5edd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
-2013-06-27  Antonio Diaz Diaz  <antonio@gnu.org>
+2013-09-17  Antonio Diaz Diaz  <antonio@gnu.org>
 
-	* Version 1.4-rc1 released.
+	* Version 1.4 released.
 	* main.c (show_header): Do not show header version.
 	* Minor fixes.
 
-- 
cgit v1.2.3