Merge branch 'master' into staging

author Marius Bakke <mbakke@fastmail.com>

Thu, 4 Jul 2019 14:16:41 +0000 (16:16 +0200)

committer Marius Bakke <mbakke@fastmail.com>

Thu, 4 Jul 2019 14:16:41 +0000 (16:16 +0200)
author Marius Bakke <mbakke@fastmail.com>
Thu, 4 Jul 2019 14:16:41 +0000 (16:16 +0200)
committer Marius Bakke <mbakke@fastmail.com>
Thu, 4 Jul 2019 14:16:41 +0000 (16:16 +0200)
diff --cc gnu/packages/imagemagick.scm
Simple merge
diff --cc gnu/packages/python-xyz.scm
Simple merge
diff --cc gnu/packages/xdisorg.scm
Simple merge
author	Marius Bakke <mbakke@fastmail.com>
	Thu, 4 Jul 2019 14:16:41 +0000 (16:16 +0200)
committer	Marius Bakke <mbakke@fastmail.com>
	Thu, 4 Jul 2019 14:16:41 +0000 (16:16 +0200)
		1	2
gnu/packages/imagemagick.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-xyz.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/xdisorg.scm	patch \|	diff1 \|	diff2 \|	blob \| history