]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #2231 from phomes/resolve-misc2
authorTom Gundersen <teg@jklm.no>
Mon, 28 Dec 2015 16:27:42 +0000 (17:27 +0100)
committerTom Gundersen <teg@jklm.no>
Mon, 28 Dec 2015 16:27:42 +0000 (17:27 +0100)
Resolve misc2

1  2 
src/resolve-host/resolve-host.c
src/resolve/resolved-dns-dnssec.c

Simple merge
Simple merge