Merge branch 'swanctl-testing'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 11 Nov 2017 15:42:38 +0000 (16:42 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 11 Nov 2017 15:42:38 +0000 (16:42 +0100)

Trivial merge