From 5cffe564ec620992e86e059f2ea83750a88eae8a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 15:04:56 +0100
Subject: Merging upstream version 1.6~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 435a8d6..26ba533 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-19  Antonio Diaz Diaz  <antonio@gnu.org>
+
+	* Version 1.6-rc2 released.
+	* License changed to "GPL version 2 or later with link exception".
+
 2014-05-06  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 1.6-rc1 released.
-- 
cgit v1.2.3