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)
commitd95f2ab0cfa20fb0fa47d2387b5e59ba24e4563b
tree2f7b6164dd6acbe9a595495263de05cc79d226f1
parentc962ae2e6299e3b837d72b4f6c0cfa956ff1834b
parentff4e01dab55da82d3842060c18b0c55bfffa88fc
Merge branch 'list-conns-plus'