]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'new-libknot'
authorMarek Vavrusa <marek@vavrusa.com>
Mon, 11 Jan 2016 04:31:39 +0000 (20:31 -0800)
committerMarek Vavrusa <marek@vavrusa.com>
Mon, 11 Jan 2016 04:31:39 +0000 (20:31 -0800)

Trivial merge