Merge commit '890440a44cd5f4f09742f521c7783785d114fffc'

author Stephen Leake <stephen_leake@stephe-leake.org>

Sun, 14 Apr 2019 16:24:42 +0000 (09:24 -0700)

committer Stephen Leake <stephen_leake@stephe-leake.org>

Sun, 14 Apr 2019 16:24:42 +0000 (09:24 -0700)
author Stephen Leake <stephen_leake@stephe-leake.org>
Sun, 14 Apr 2019 16:24:42 +0000 (09:24 -0700)
committer Stephen Leake <stephen_leake@stephe-leake.org>
Sun, 14 Apr 2019 16:24:42 +0000 (09:24 -0700)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/simple.el
Simple merge
author	Stephen Leake <stephen_leake@stephe-leake.org>
	Sun, 14 Apr 2019 16:24:42 +0000 (09:24 -0700)
committer	Stephen Leake <stephen_leake@stephe-leake.org>
	Sun, 14 Apr 2019 16:24:42 +0000 (09:24 -0700)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	patch \|	diff1 \|	diff2 \|	blob \| history