Merge pull request #7793 from rojkov/fix-6456
authorLennart Poettering <lennart@poettering.net>
Wed, 3 Jan 2018 17:43:14 +0000 (18:43 +0100)
committerGitHub <noreply@github.com>
Wed, 3 Jan 2018 17:43:14 +0000 (18:43 +0100)
resolved: fix refcounting DnsScope's conflict_queue


Trivial merge