Merge branch 'master' into core-updates

author Ricardo Wurmus <rekado@elephly.net>

Sat, 2 Jun 2018 11:44:43 +0000 (13:44 +0200)

committer Ricardo Wurmus <rekado@elephly.net>

Sat, 2 Jun 2018 11:44:43 +0000 (13:44 +0200)
author Ricardo Wurmus <rekado@elephly.net>
Sat, 2 Jun 2018 11:44:43 +0000 (13:44 +0200)
committer Ricardo Wurmus <rekado@elephly.net>
Sat, 2 Jun 2018 11:44:43 +0000 (13:44 +0200)
diff --cc gnu/packages/bioinformatics.scm
Simple merge
diff --cc gnu/packages/emacs.scm
Simple merge
diff --cc gnu/packages/statistics.scm
Simple merge
author	Ricardo Wurmus <rekado@elephly.net>
	Sat, 2 Jun 2018 11:44:43 +0000 (13:44 +0200)
committer	Ricardo Wurmus <rekado@elephly.net>
	Sat, 2 Jun 2018 11:44:43 +0000 (13:44 +0200)
		1	2
gnu/packages/bioinformatics.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/emacs.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/statistics.scm	patch \|	diff1 \|	diff2 \|	blob \| history