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)
commit74f8ad7fd9565326045ae43949c2c0529c97b0dd
treebd1de68f38d8560f7e10d2a6bbc1b008bb3cc18e
parent0d632555130e4f8665c6aeb4de90d0428509a4b8
parent7df35af7ccc9a7cac683dd7a41313d419b784d78
Merge branch 'swanctl-testing'