Merge pull request #6420 from keszybz/gateway-name

author Lennart Poettering <lennart@poettering.net>

Tue, 1 Aug 2017 07:43:41 +0000 (09:43 +0200)

committer GitHub <noreply@github.com>

Tue, 1 Aug 2017 07:43:41 +0000 (09:43 +0200)
author Lennart Poettering <lennart@poettering.net>
Tue, 1 Aug 2017 07:43:41 +0000 (09:43 +0200)
committer GitHub <noreply@github.com>
Tue, 1 Aug 2017 07:43:41 +0000 (09:43 +0200)
diff --cc meson.build
Simple merge
diff --cc meson_options.txt
Simple merge
diff --cc src/nss-myhostname/nss-myhostname.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Tue, 1 Aug 2017 07:43:41 +0000 (09:43 +0200)
committer	GitHub <noreply@github.com>
	Tue, 1 Aug 2017 07:43:41 +0000 (09:43 +0200)
		1	2
meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
meson_options.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/nss-myhostname/nss-myhostname.c	patch \|	diff1 \|	diff2 \|	blob \| history