merge stable

author Kevin McCarthy <kevin@8t8.us>

Thu, 8 Sep 2016 01:56:50 +0000 (18:56 -0700)

committer Kevin McCarthy <kevin@8t8.us>

Thu, 8 Sep 2016 01:56:50 +0000 (18:56 -0700)
author Kevin McCarthy <kevin@8t8.us>
Thu, 8 Sep 2016 01:56:50 +0000 (18:56 -0700)
committer Kevin McCarthy <kevin@8t8.us>
Thu, 8 Sep 2016 01:56:50 +0000 (18:56 -0700)
diff --cc doc/manual.xml.head
Simple merge
diff --cc init.h
Simple merge
author	Kevin McCarthy <kevin@8t8.us>
	Thu, 8 Sep 2016 01:56:50 +0000 (18:56 -0700)
committer	Kevin McCarthy <kevin@8t8.us>
	Thu, 8 Sep 2016 01:56:50 +0000 (18:56 -0700)
		1	2
doc/manual.xml.head	patch \|	diff1 \|	diff2 \|	blob \| history
init.h	patch \|	diff1 \|	diff2 \|	blob \| history