[master] Finished merge of trac5282 (client https)

diff --git a/ChangeLog b/ChangeLog
index ffa95edd4de7ddf0d695011523177523d74681d5..364bb1de95fe2f1c21fe68e8a89fb430a1f01d50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1299.  [doc]           fdupont, tmark
+       Added an example stunnel configuration file to demonstrate
+       using kea-shell through https.
+       (Trac #5282, git xxx)
+
 1298.  [func]          marcin, tomek
        DHCPv4 server supports shared networks. It allows for grouping
        multiple subnets and use them interchangeably to allocate