Merge pull request #3005 from keszybz/kill-user-proceses

author Lennart Poettering <lennart@poettering.net>

Thu, 21 Apr 2016 10:29:36 +0000 (12:29 +0200)

committer Lennart Poettering <lennart@poettering.net>

Thu, 21 Apr 2016 10:29:36 +0000 (12:29 +0200)
author Lennart Poettering <lennart@poettering.net>
Thu, 21 Apr 2016 10:29:36 +0000 (12:29 +0200)
committer Lennart Poettering <lennart@poettering.net>
Thu, 21 Apr 2016 10:29:36 +0000 (12:29 +0200)
diff --cc Makefile.am
Simple merge
diff --cc NEWS
Simple merge
diff --cc man/systemd-run.xml
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 21 Apr 2016 10:29:36 +0000 (12:29 +0200)
committer	Lennart Poettering <lennart@poettering.net>
	Thu, 21 Apr 2016 10:29:36 +0000 (12:29 +0200)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
man/systemd-run.xml	patch \|	diff1 \|	diff2 \|	blob \| history