Merge commit 'de238b39e335c6814283faa171b35145f124edf2'

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

Thu, 11 Apr 2019 21:00:02 +0000 (14:00 -0700)

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

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