From 6add6b2fe78c549d174729869e26cee917e31d5f Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Thu, 16 Feb 2006 18:12:24 +0000
Subject: Added --port-share option for allowing OpenVPN and HTTPS server to
 share the same port number.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@893 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 ChangeLog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index e38de18..496ac8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,10 @@ Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>
 
 $Id$
 
-2006.xx.xx -- Version 2.1-beta9
+2006.02.16 -- Version 2.1-beta9
 
+* Added --port-share option for allowing OpenVPN and HTTPS
+  server to share the same port number.
 * Added --management-client option to connect as a client
   to management GUI app rather than be connected to as a
   server.
-- 
cgit