Merge branch 'swima-reserved'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 12 Jun 2018 19:49:54 +0000 (21:49 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 12 Jun 2018 19:49:54 +0000 (21:49 +0200)

Trivial merge