Merge pull request #6944 from poettering/suspend-fix

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Thu, 5 Oct 2017 09:26:44 +0000 (11:26 +0200)

committer GitHub <noreply@github.com>

Thu, 5 Oct 2017 09:26:44 +0000 (11:26 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 5 Oct 2017 09:26:44 +0000 (11:26 +0200)
committer GitHub <noreply@github.com>
Thu, 5 Oct 2017 09:26:44 +0000 (11:26 +0200)
diff --cc NEWS
Simple merge
diff --cc src/login/logind-dbus.c
Simple merge
diff --cc src/systemctl/systemctl.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 5 Oct 2017 09:26:44 +0000 (11:26 +0200)
committer	GitHub <noreply@github.com>
	Thu, 5 Oct 2017 09:26:44 +0000 (11:26 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
src/login/logind-dbus.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/systemctl/systemctl.c	patch \|	diff1 \|	diff2 \|	blob \| history