Merge pull request #956 from fissie/master
authorSteven Barth <steven@midlink.org>
Mon, 2 Mar 2015 20:53:45 +0000 (21:53 +0100)
committerSteven Barth <steven@midlink.org>
Mon, 2 Mar 2015 20:53:45 +0000 (21:53 +0100)
fix aiccu requiretls option handling


Trivial merge