From: Tom Gundersen <teg@jklm.no>
Date: Tue, 25 Aug 2015 08:18:16 +0000 (+0200)
Subject: Merge pull request #1023 from poettering/resolved-fixes
X-Git-Tag: v225~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd42560795996c723d4631570b74ac644934ebd3;p=thirdparty%2Fsystemd.git

Merge pull request #1023 from poettering/resolved-fixes

A variety of resolved fixes
---

dd42560795996c723d4631570b74ac644934ebd3