Merge pull request #987 from plntyk/gnutls-fixes-v2
authorTed Hess <thess@kitschensync.net>
Wed, 4 Mar 2015 19:59:32 +0000 (14:59 -0500)
committerTed Hess <thess@kitschensync.net>
Wed, 4 Mar 2015 19:59:32 +0000 (14:59 -0500)
Gnutls fixes v2


Trivial merge