From 6d1953cf9ec2afae8ebb60b7b33f5a0d823c16fe Mon Sep 17 00:00:00 2001
From: Erik Ekman <erik@kryo.se>
Date: Sun, 5 Feb 2012 08:43:12 +0100
Subject: [PATCH] Update branch changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index c860636..6e49fd7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,7 +5,7 @@ iodine - http://code.kryo.se/iodine
 
 CHANGES:
 
-2010-02-13: 0.6.0-rc1 "Hotspotify"
+20xx-xx-xx: 0.6.Y "Hotspotify"
 	- Fixed tunnel not working on Windows.
 	- Any device name is now supported on Windows, fixes #47.
 	- Multiple installed TAP32 interfaces are now supported, fixes #46.
@@ -30,6 +30,7 @@ CHANGES:
 	- Merged low-latency patch from Anne Bezemer, fixes #76.
 	- Resolve client nameserver argument if given as hostname, fixes #82.
 	- Open log before chroot, fixes #86: logging on FreeBSD.
+	Since rc1:
 	- Fix DNS tunneling bug caused by uninitialized variable, #94
 	- Handle spaces when entering password interactively, fixes #93.
 		Patch by Hagar.