Merge pull request #4071 from poettering/some-fixes-3
authorMartin Pitt <martin.pitt@ubuntu.com>
Thu, 1 Sep 2016 06:30:12 +0000 (08:30 +0200)
committerGitHub <noreply@github.com>
Thu, 1 Sep 2016 06:30:12 +0000 (08:30 +0200)
three trivial fixes


Trivial merge