Merge branch 'master' into core-updates

author Marius Bakke <mbakke@fastmail.com>

Wed, 21 Nov 2018 23:10:44 +0000 (00:10 +0100)

committer Marius Bakke <mbakke@fastmail.com>

Wed, 21 Nov 2018 23:10:44 +0000 (00:10 +0100)
author Marius Bakke <mbakke@fastmail.com>
Wed, 21 Nov 2018 23:10:44 +0000 (00:10 +0100)
committer Marius Bakke <mbakke@fastmail.com>
Wed, 21 Nov 2018 23:10:44 +0000 (00:10 +0100)
diff --cc gnu/packages/build-tools.scm
Simple merge
diff --cc gnu/packages/gnome.scm
Simple merge
diff --cc gnu/packages/image.scm
Simple merge
diff --cc gnu/packages/tls.scm
Simple merge
diff --cc gnu/packages/web.scm
Simple merge
author	Marius Bakke <mbakke@fastmail.com>
	Wed, 21 Nov 2018 23:10:44 +0000 (00:10 +0100)
committer	Marius Bakke <mbakke@fastmail.com>
	Wed, 21 Nov 2018 23:10:44 +0000 (00:10 +0100)
		1	2
gnu/packages/build-tools.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/gnome.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/image.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/tls.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/web.scm	patch \|	diff1 \|	diff2 \|	blob \| history