From a69fbf4aa2ec3f4b7dc396ecd4b251694f9c226c Mon Sep 17 00:00:00 2001
From: Michel Oosterhof <michel@oosterhof.net>
Date: Mon, 22 Aug 2016 16:08:49 +0400
Subject: [PATCH] telnet changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e294d0a..32b329d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+* 2016-08-22 Merged Telnet support by @obilodeau!
 * 2016-08-20 Update your libraries! 'configparser' now required: "pip install configparser"
 * 2016-05-06 Load pickle once at startup for improved speed
 * 2016-04-28 files in utils/ have been moved to bin/