From: David Sommerseth <dazo@users.sourceforge.net>
Date: Fri, 12 Nov 2010 23:48:28 +0000 (+0100)
Subject: Merge branch 'svn-BETA21' into beta2.2
X-Git-Tag: v2.2-beta4~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8367889e8467ce73b051aa8db64b0336aea8ed4b;p=thirdparty%2Fopenvpn.git

Merge branch 'svn-BETA21' into beta2.2

Conflicts:
	version.m4
	- Reset version.m4 to a more neutral version number

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

8367889e8467ce73b051aa8db64b0336aea8ed4b
diff --cc version.m4
index 0dd97ae70,c04c6cf74..f390f4c2a
--- a/version.m4
+++ b/version.m4
@@@ -1,5 -1,5 +1,5 @@@
  dnl define the OpenVPN version
- define(PRODUCT_VERSION,[2.2-beta3])
 -define(PRODUCT_VERSION,[2.1.3b])
++define(PRODUCT_VERSION,[2.2-beta])
  dnl define the TAP version
  define(PRODUCT_TAP_ID,[tap0901])
  define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])