Merge branch 'vendor-ids'
authorMartin Willi <martin@revosec.ch>
Thu, 23 Jan 2014 15:04:48 +0000 (16:04 +0100)
committerMartin Willi <martin@revosec.ch>
Thu, 23 Jan 2014 15:04:48 +0000 (16:04 +0100)
commit5770e28e96fceae69adecc0123578354b76c5c18
tree0944e8d4549a13519786a437ac93ce113663137d
parent6a620f9936bad77773533579a7ee547faae699cd
parentc7c2e24a56ba0961617ce262e7094b8411068293
Merge branch 'vendor-ids'

Refactors IKEv2 vendor ID handling, and introduces some IDs seen when talking
to Cisco devices.