Merge branch 'staging' into core-updates

author Marius Bakke <mbakke@fastmail.com>

Sun, 10 Feb 2019 20:05:19 +0000 (21:05 +0100)

committer Marius Bakke <mbakke@fastmail.com>

Sun, 10 Feb 2019 20:05:19 +0000 (21:05 +0100)
author Marius Bakke <mbakke@fastmail.com>
Sun, 10 Feb 2019 20:05:19 +0000 (21:05 +0100)
committer Marius Bakke <mbakke@fastmail.com>
Sun, 10 Feb 2019 20:05:19 +0000 (21:05 +0100)
diff --cc gnu/local.mk
Simple merge
diff --cc gnu/packages/python-xyz.scm
Simple merge
diff --cc gnu/packages/video.scm
Simple merge
diff --cc gnu/packages/xml.scm
Simple merge
author	Marius Bakke <mbakke@fastmail.com>
	Sun, 10 Feb 2019 20:05:19 +0000 (21:05 +0100)
committer	Marius Bakke <mbakke@fastmail.com>
	Sun, 10 Feb 2019 20:05:19 +0000 (21:05 +0100)
		1	2
gnu/local.mk	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-xyz.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/video.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/xml.scm	patch \|	diff1 \|	diff2 \|	blob \| history