From 4dcaed50804e6ac1b6ff1f0157d125ef3b8d6a40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= <misi@niif.hu>
Date: Thu, 2 Aug 2018 12:37:38 +0200
Subject: [PATCH] add changes

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9e61dc4..c053ffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 12/11/2017 Oleg Moskalenko <mom040267@gmail.com>
 Version 4.5.0.8 'dan Eider':
+	- merge travis branch
+	- hint with comment fallthrough to avoid warning
 	- reload-tls-certs PR#236 (by Arne Georg Gisnås Gleditsch)
 	- minor fixe PR#223 (by Pavel Kretov)
 	  move rm Makefile to distclean