From: David Sommerseth <dazo@users.sourceforge.net>
Date: Mon, 25 Apr 2011 15:16:34 +0000 (+0200)
Subject: Merge branch 'feat_ipv6_payload'
X-Git-Tag: v2.3-alpha1~239
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5f7d08b8c3d4287dd40bbdf52525add8f5cee20;p=thirdparty%2Fopenvpn.git

Merge branch 'feat_ipv6_payload'

Conflicts:
	options.c
	- feat_ipv6_payload and feat_ip6_transport both updates
      this file with presence information

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

c5f7d08b8c3d4287dd40bbdf52525add8f5cee20
diff --cc options.c
index 4e87a97dc,6f98d140a..8d1645d77
--- a/options.c
+++ b/options.c
@@@ -79,13 -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)]"
    " built on " __DATE__
  ;