From 8bc93d7ffbc127e0b095c7274a68eb0c175f93ae Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Sat, 15 Oct 2005 08:44:02 +0000
Subject: svn merge -r 618:619 $SO/patches/openvpn-2-0_rc16-mh/openvpn Merged
 --multihome patch + aggregated sockflags. Pre-2.1_beta3

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@622 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 ChangeLog | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 5bbdca1..04c8567 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,12 +11,11 @@ $Id$
   from the file specified by --ca regardless if the pkcs12 file
   contains a CA cert or not (Mathias Sundman).
 * Merged --capath patch (Thomas Noel).
-* NOTE TO PACKAGE MAINTAINERS: Moved "plugin"
-  directory to "plugins".  This is
-  to work around a strange problem with the
-  "make dist" target in the automake-generated
-  makefile, where the target tries to do a
-  rather bogus "gcc -g -O2 -I. plugin.c -o plugin".
+* Merged --multihome patch.
+* NOTE TO PACKAGE MAINTAINERS: Moved "plugin" directory to "plugins".
+  This is to work around a strange problem with the "make dist"
+  target in the automake-generated makefile, where the target tries to
+  do a rather bogus "gcc -g -O2 -I. plugin.c -o plugin".
 
 2005.10.13 -- Version 2.1-beta2
 
-- 
cgit v1.2.3