From: David Sommerseth <dazo@users.sourceforge.net>
Date: Sun, 14 Nov 2010 22:48:49 +0000 (+0100)
Subject: Merge branch 'bugfix2.1' into beta2.2
X-Git-Tag: v2.2-beta4~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b519cf51d02daacb388eb90bd0c5930145d7a0d;p=thirdparty%2Fopenvpn.git

Merge branch 'bugfix2.1' into beta2.2

Conflicts:
	options.c
	- Disagreements about a new included file (forward.h)

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
---

4b519cf51d02daacb388eb90bd0c5930145d7a0d
diff --cc options.c
index 66b57d736,e4c3c2ec9..3aa68200e
--- a/options.c
+++ b/options.c
@@@ -48,8 -45,7 +48,9 @@@
  #include "pool.h"
  #include "helper.h"
  #include "manage.h"
+ #include "forward.h"
 +#include "configure.h"
 +#include <ctype.h>
  
  #include "memdbg.h"