From: Martin Willi <martin@revosec.ch>
Date: Thu, 6 Feb 2014 14:58:41 +0000 (+0100)
Subject: Merge branch 'cmd-proposals'
X-Git-Tag: 5.1.2rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe40c4754767bda0fadb1a83ec9ab6af0125b488;p=thirdparty%2Fstrongswan.git

Merge branch 'cmd-proposals'

Introduce --ike/esp/ah-proposal options to offer custom proposals, and requests
an IPv6 virtual IP if an IPv6 --remote-ts is given.

Fixes #508.
---

fe40c4754767bda0fadb1a83ec9ab6af0125b488