From 06821cd88178d7d9a1fbcb4027a2bf939dd42cd1 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 16:37:35 +0100
Subject: Merging upstream version 1.2~rc1.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 571f232..30a8936 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-08  Antonio Diaz Diaz  <antonio@gnu.org>
+
+	* Version 1.2-rc1 released.
+	* Minor changes.
+
 2014-01-20  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 1.2-pre1 released.
-- 
cgit v1.2.3