From: Tom Gundersen <teg@jklm.no>
Date: Mon, 28 Dec 2015 16:27:42 +0000 (+0100)
Subject: Merge pull request #2231 from phomes/resolve-misc2
X-Git-Tag: v229~185
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=b038f6d1d83606b25f84e180745e263ccee3c61b;p=systemd%2F.git

Merge pull request #2231 from phomes/resolve-misc2

Resolve misc2
---

b038f6d1d83606b25f84e180745e263ccee3c61b