Merge pull request #4495 from topimiettinen/block-shmat-exec

author Djalal Harouni <tixxdz@opendz.org>

Fri, 28 Oct 2016 13:41:07 +0000 (15:41 +0200)

committer GitHub <noreply@github.com>

Fri, 28 Oct 2016 13:41:07 +0000 (15:41 +0200)
author Djalal Harouni <tixxdz@opendz.org>
Fri, 28 Oct 2016 13:41:07 +0000 (15:41 +0200)
committer GitHub <noreply@github.com>
Fri, 28 Oct 2016 13:41:07 +0000 (15:41 +0200)
diff --cc man/systemd.exec.xml
Simple merge
diff --cc src/core/execute.c
Simple merge
author	Djalal Harouni <tixxdz@opendz.org>
	Fri, 28 Oct 2016 13:41:07 +0000 (15:41 +0200)
committer	GitHub <noreply@github.com>
	Fri, 28 Oct 2016 13:41:07 +0000 (15:41 +0200)
		1	2
man/systemd.exec.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history