Merge branch 'vendor/LDNS'
authorJohn Marino <draco@marino.st>
Fri, 18 Oct 2013 22:04:02 +0000 (00:04 +0200)
committerJohn Marino <draco@marino.st>
Fri, 18 Oct 2013 22:04:02 +0000 (00:04 +0200)

Trivial merge