From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 Jan 2016 22:30:20 +0000 (+0100)
Subject: Merge pull request #490 from pyssling/master
X-Git-Tag: v229~143
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=d9a090b9957b04ec34a145a0a40f41abafe73917;p=systemd%2F.git

Merge pull request #490 from pyssling/master

Add machine-id setting
---

d9a090b9957b04ec34a145a0a40f41abafe73917