Merge pull request #2372 from poettering/dnssec17
authorTom Gundersen <teg@jklm.no>
Wed, 20 Jan 2016 10:30:20 +0000 (11:30 +0100)
committerTom Gundersen <teg@jklm.no>
Wed, 20 Jan 2016 10:30:20 +0000 (11:30 +0100)
resolved bus API improvements

1  2 
Makefile.am

diff --cc Makefile.am
Simple merge