Merge branch 'Ed25519'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Fri, 16 Dec 2016 11:24:54 +0000 (12:24 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Fri, 16 Dec 2016 11:24:54 +0000 (12:24 +0100)

Trivial merge