merge stable

author Kevin McCarthy <kevin@8t8.us>

Sun, 30 Apr 2017 21:25:10 +0000 (14:25 -0700)

committer Kevin McCarthy <kevin@8t8.us>

Sun, 30 Apr 2017 21:25:10 +0000 (14:25 -0700)
author Kevin McCarthy <kevin@8t8.us>
Sun, 30 Apr 2017 21:25:10 +0000 (14:25 -0700)
committer Kevin McCarthy <kevin@8t8.us>
Sun, 30 Apr 2017 21:25:10 +0000 (14:25 -0700)
diff --cc init.c
Simple merge
diff --cc init.h
Simple merge
author	Kevin McCarthy <kevin@8t8.us>
	Sun, 30 Apr 2017 21:25:10 +0000 (14:25 -0700)
committer	Kevin McCarthy <kevin@8t8.us>
	Sun, 30 Apr 2017 21:25:10 +0000 (14:25 -0700)
		1	2
init.c	patch \|	diff1 \|	diff2 \|	blob \| history
init.h	patch \|	diff1 \|	diff2 \|	blob \| history