Merge pull request #2760 from ronnychevalier/rc/core_no_new_privileges_seccompv3

author Daniel Mack <github@zonque.org>

Mon, 21 Mar 2016 11:57:43 +0000 (12:57 +0100)

committer Daniel Mack <github@zonque.org>

Mon, 21 Mar 2016 11:57:43 +0000 (12:57 +0100)
author Daniel Mack <github@zonque.org>
Mon, 21 Mar 2016 11:57:43 +0000 (12:57 +0100)
committer Daniel Mack <github@zonque.org>
Mon, 21 Mar 2016 11:57:43 +0000 (12:57 +0100)
diff --cc Makefile.am
Simple merge
diff --cc src/core/execute.c
Simple merge
author	Daniel Mack <github@zonque.org>
	Mon, 21 Mar 2016 11:57:43 +0000 (12:57 +0100)
committer	Daniel Mack <github@zonque.org>
	Mon, 21 Mar 2016 11:57:43 +0000 (12:57 +0100)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history