Merge branch 'vici'
authorMartin Willi <martin@revosec.ch>
Wed, 7 May 2014 13:12:09 +0000 (15:12 +0200)
committerMartin Willi <martin@revosec.ch>
Wed, 7 May 2014 13:12:09 +0000 (15:12 +0200)
Introduces the vici plugin providing a Versatile IKE Configuration Interface
to configure, monitor and control the IKE daemon charon over a stable IPC
socket interface.


Trivial merge