From: David Sommerseth <davids@redhat.com>
Date: Mon, 23 May 2011 10:16:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'cron2/feat_ipv6_payload_2.3'
X-Git-Tag: v2.3-alpha1~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a606673bdd4251c0db876e36e92751907816bb4;p=thirdparty%2Fopenvpn.git

Merge remote-tracking branch 'cron2/feat_ipv6_payload_2.3'

Conflicts:
	options.c
	- version string for IPv6 payload changed

Signed-off-by: David Sommerseth <davids@redhat.com>
---

8a606673bdd4251c0db876e36e92751907816bb4
diff --cc options.c
index f643acc01,824492e58..169a8e8af
--- a/options.c
+++ b/options.c
@@@ -79,14 -79,8 +79,14 @@@ const char title_string[] 
  #endif
  #ifdef ENABLE_EUREPHIA
    " [eurephia]"
 +#endif
 +#if ENABLE_IP_PKTINFO
 +  " [MH]"
 +#endif
 +#ifdef USE_PF_INET6
 +  " [PF_INET6]"
  #endif
-   " [IPv6 payload 20110424-2 (2.2RC2)]"
+   " [IPv6 payload 20110522-1 (2.2.0)]"
    " built on " __DATE__
  ;