Merge "DNS: Create a system-level DNS resolver"
authorMark Michelson <mmichelson@digium.com>
Wed, 8 Jul 2015 14:00:41 +0000 (09:00 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 8 Jul 2015 14:00:41 +0000 (09:00 -0500)

Trivial merge