Merge branch 'stable'

author Kevin McCarthy <kevin@8t8.us>

Sat, 5 Jan 2019 21:29:11 +0000 (13:29 -0800)

committer Kevin McCarthy <kevin@8t8.us>

Sat, 5 Jan 2019 21:29:11 +0000 (13:29 -0800)
author Kevin McCarthy <kevin@8t8.us>
Sat, 5 Jan 2019 21:29:11 +0000 (13:29 -0800)
committer Kevin McCarthy <kevin@8t8.us>
Sat, 5 Jan 2019 21:29:11 +0000 (13:29 -0800)
diff --cc doc/manual.xml.head
Simple merge
diff --cc main.c
Simple merge
author	Kevin McCarthy <kevin@8t8.us>
	Sat, 5 Jan 2019 21:29:11 +0000 (13:29 -0800)
committer	Kevin McCarthy <kevin@8t8.us>
	Sat, 5 Jan 2019 21:29:11 +0000 (13:29 -0800)
		1	2
doc/manual.xml.head	patch \|	diff1 \|	diff2 \|	blob \| history
main.c	patch \|	diff1 \|	diff2 \|	blob \| history