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)

Trivial merge