From abb2d6cb8773724c542174d16b57fa0d0bd47edd Mon Sep 17 00:00:00 2001
From: Erik Ekman <erik@kryo.se>
Date: Wed, 29 Jan 2014 18:31:21 +0100
Subject: [PATCH] Update changelog

---
 CHANGELOG | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7e40660..967f347 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,8 @@ iodine - http://code.kryo.se/iodine
 
 CHANGES:
 
-trunk:
+master:
+	- Add socket activation for systemd, by mscherer
 	- Add automated lookup of external ip (via -n auto).
 
 2010-02-06: 0.6.0-rc1 "Hotspotify"