Merge branch 'master' into staging

author Brett Gilio <brettg@posteo.net>

Fri, 13 Dec 2019 13:57:51 +0000 (07:57 -0600)

committer Brett Gilio <brettg@posteo.net>

Fri, 13 Dec 2019 13:58:30 +0000 (07:58 -0600)
author Brett Gilio <brettg@posteo.net>
Fri, 13 Dec 2019 13:57:51 +0000 (07:57 -0600)
committer Brett Gilio <brettg@posteo.net>
Fri, 13 Dec 2019 13:58:30 +0000 (07:58 -0600)
diff --cc gnu/local.mk
Simple merge
diff --cc gnu/packages/imagemagick.scm
Simple merge
diff --cc gnu/packages/linux.scm
Simple merge
author	Brett Gilio <brettg@posteo.net>
	Fri, 13 Dec 2019 13:57:51 +0000 (07:57 -0600)
committer	Brett Gilio <brettg@posteo.net>
	Fri, 13 Dec 2019 13:58:30 +0000 (07:58 -0600)
		1	2
gnu/local.mk	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/imagemagick.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	patch \|	diff1 \|	diff2 \|	blob \| history