Merge branch 'gnutls' into ipv6
authorFelix Morgner <felix.morgner@gmail.com>
Thu, 1 May 2014 07:07:48 +0000 (09:07 +0200)
committerFelix Morgner <felix.morgner@gmail.com>
Thu, 1 May 2014 07:07:48 +0000 (09:07 +0200)

Trivial merge