Merge branch 'cmd-proposals'
authorMartin Willi <martin@revosec.ch>
Thu, 6 Feb 2014 14:58:41 +0000 (15:58 +0100)
committerMartin Willi <martin@revosec.ch>
Thu, 6 Feb 2014 14:58:41 +0000 (15:58 +0100)
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.


Trivial merge