Merge branch 'nat-transport'
authorMartin Willi <martin@revosec.ch>
Wed, 19 Jun 2013 14:36:27 +0000 (16:36 +0200)
committerMartin Willi <martin@revosec.ch>
Wed, 19 Jun 2013 14:36:27 +0000 (16:36 +0200)
commit4e8142e8e9b45f11460db2d360f20e207ed7e6d4
treeb1aec2210ece0afb2a12f0a9196e20e6f2ac05a4
parent4f88ad669a2a5d65bd7e6d60896df14246f58a5e
parent24df067810993dc9736f7bcc274d4063d4d1c721
Merge branch 'nat-transport'

Enable transport mode in NAT situations when using IKEv2. Additionally brings
an extended leftsubnet format, where each subnet can take a separate protocol
and port.