Merge pull request #1023 from poettering/resolved-fixes
authorTom Gundersen <teg@jklm.no>
Tue, 25 Aug 2015 08:18:16 +0000 (10:18 +0200)
committerTom Gundersen <teg@jklm.no>
Tue, 25 Aug 2015 08:18:16 +0000 (10:18 +0200)
A variety of resolved fixes


Trivial merge