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)
commit803ac56626fcbc9864eea962640c8a295adc6db2
treeaeb1c702d11ba36c51e207806c0705fc2f03db40
parent88b941939f4b008fbe79e0a1ffdd71cb636a0d97
parent23e0d6dca32573d2d2dfeb42ee52c42ea21781c3
Merge branch 'swima'