Merge branch 'master' into staging

author Marius Bakke <mbakke@fastmail.com>

Thu, 27 Dec 2018 14:44:38 +0000 (15:44 +0100)

committer Marius Bakke <mbakke@fastmail.com>

Thu, 27 Dec 2018 14:44:38 +0000 (15:44 +0100)
author Marius Bakke <mbakke@fastmail.com>
Thu, 27 Dec 2018 14:44:38 +0000 (15:44 +0100)
committer Marius Bakke <mbakke@fastmail.com>
Thu, 27 Dec 2018 14:44:38 +0000 (15:44 +0100)
diff --cc doc/guix.texi
Simple merge
diff --cc gnu/packages/emacs.scm
Simple merge
diff --cc gnu/packages/enlightenment.scm
Simple merge
diff --cc gnu/packages/linux.scm
Simple merge
diff --cc gnu/packages/tls.scm
Simple merge
author	Marius Bakke <mbakke@fastmail.com>
	Thu, 27 Dec 2018 14:44:38 +0000 (15:44 +0100)
committer	Marius Bakke <mbakke@fastmail.com>
	Thu, 27 Dec 2018 14:44:38 +0000 (15:44 +0100)
		1	2
doc/guix.texi	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/emacs.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/enlightenment.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/linux.scm	patch \|	diff1 \|	diff2 \|	blob \| history
gnu/packages/tls.scm	patch \|	diff1 \|	diff2 \|	blob \| history