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)
commitc289fc55d1fce7f474127933063ba2008a188259
treeeb290d6d90a33d0fd155377d8b6d9c0a7d3341c7
parent14130a16fbe48dcba15d6e215ddaa0775074f3a7
parentf6d844d1999080359046790022dc820cb247cc23
Merge branch 'gnutls' into ipv6