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)
commit96b1f0b79d1a95e15fef0f80f11fa8c5866ce4ce
tree01bd1f3c18c2f91da2126056b24b445916950a8b
parent4f1d2f2b095e523cf508749e7a5db9fc61fc2de9
parent2a26566ed33281a60d06aa86da50fce136f7c685
Merge branch 'swima-reserved'