From 79cd96ee549de2d24d5ba81d6f8fa4d642943b52 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 12:51:28 +0100
Subject: Merging upstream version 1.17~rc2.

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 d6529ef..13ca71c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-08  Antonio Diaz Diaz  <antonio@gnu.org>
+
+	* Version 1.17-rc2 released.
+	* Minor changes.
+
 2015-01-21  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 1.17-rc1 released.
-- 
cgit v1.2.3