From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 4 Jun 2016 22:47:56 +0000 (-0400)
Subject: Merge pull request #3392 from poettering/assorted-stuff
X-Git-Tag: v231~220
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20f8477be541f2486737f1be32bdb0bd0d6372fd;p=thirdparty%2Fsystemd.git

Merge pull request #3392 from poettering/assorted-stuff

Assorted stuff
---

20f8477be541f2486737f1be32bdb0bd0d6372fd