Merge branch 'master' into staging

author Marius Bakke <mbakke@fastmail.com>

Mon, 2 Mar 2020 22:49:10 +0000 (23:49 +0100)

committer Marius Bakke <mbakke@fastmail.com>

Mon, 2 Mar 2020 22:49:10 +0000 (23:49 +0100)
author Marius Bakke <mbakke@fastmail.com>
Mon, 2 Mar 2020 22:49:10 +0000 (23:49 +0100)
committer Marius Bakke <mbakke@fastmail.com>
Mon, 2 Mar 2020 22:49:10 +0000 (23:49 +0100)
diff --cc gnu/local.mk
Simple merge
diff --cc gnu/packages/databases.scm
Simple merge
diff --cc gnu/packages/linux.scm
Simple merge
diff --cc gnu/packages/python-xyz.scm
Simple merge
author	Marius Bakke <mbakke@fastmail.com>
	Mon, 2 Mar 2020 22:49:10 +0000 (23:49 +0100)
committer	Marius Bakke <mbakke@fastmail.com>
	Mon, 2 Mar 2020 22:49:10 +0000 (23:49 +0100)
		1	2
gnu/local.mk	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/databases.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/python-xyz.scm	patch \|	diff1 \|	diff2 \|	blob \| history