Merge branch 'swima'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 8 Jul 2017 21:20:32 +0000 (23:20 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 8 Jul 2017 21:20:32 +0000 (23:20 +0200)

Trivial merge