Merge branch 'tss2-sapi'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 20 Jul 2016 09:26:45 +0000 (11:26 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 20 Jul 2016 09:26:45 +0000 (11:26 +0200)
commit6f4b73615b627fc1f615af894b6a1b7e7bd594fe
tree0f7b7a580120adb49e956fb21b305555808ae06f
parent60d0f52fd6da3cb9ac379487344c4936e5f73882
parent0274163674fa822609c26b929c89278d28c318bc
Merge branch 'tss2-sapi'