From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 15 Jun 2016 01:08:36 +0000 (-0400)
Subject: Merge pull request #3540 from poettering/resolved-various
X-Git-Tag: v231~156
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d38158b5dfcbb5386789eef7a2befea4c72115f;p=thirdparty%2Fsystemd.git

Merge pull request #3540 from poettering/resolved-various

three resolved fixes
---

7d38158b5dfcbb5386789eef7a2befea4c72115f