Merge pull request #5366 from poettering/default-hostname-fix
authorLennart Poettering <lennart@poettering.net>
Fri, 17 Feb 2017 12:51:27 +0000 (13:51 +0100)
committerGitHub <noreply@github.com>
Fri, 17 Feb 2017 12:51:27 +0000 (13:51 +0100)
fallback hostname fixes


Trivial merge