Merge branch 'master' into staging

author Ludovic Courtès <ludo@gnu.org>

Mon, 8 Apr 2019 21:08:56 +0000 (23:08 +0200)

committer Ludovic Courtès <ludo@gnu.org>

Mon, 8 Apr 2019 21:08:56 +0000 (23:08 +0200)
author Ludovic Courtès <ludo@gnu.org>
Mon, 8 Apr 2019 21:08:56 +0000 (23:08 +0200)
committer Ludovic Courtès <ludo@gnu.org>
Mon, 8 Apr 2019 21:08:56 +0000 (23:08 +0200)
diff --cc gnu/local.mk
Simple merge
diff --cc gnu/packages/linux.scm
Simple merge
diff --cc gnu/packages/maths.scm
Simple merge
diff --cc gnu/packages/video.scm
Simple merge
author	Ludovic Courtès <ludo@gnu.org>
	Mon, 8 Apr 2019 21:08:56 +0000 (23:08 +0200)
committer	Ludovic Courtès <ludo@gnu.org>
	Mon, 8 Apr 2019 21:08:56 +0000 (23:08 +0200)
		1	2
gnu/local.mk	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/maths.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/video.scm	patch \|	diff1 \|	diff2 \|	blob \| history