Merge branch 'list-conns-plus'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 4 May 2016 16:16:32 +0000 (18:16 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 4 May 2016 16:16:32 +0000 (18:16 +0200)

Trivial merge