Merge branch 'disable_ocsp'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 2 Jan 2017 13:35:39 +0000 (14:35 +0100)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 2 Jan 2017 13:35:39 +0000 (14:35 +0100)

Trivial merge