Merge branch 'stable'

author Kevin McCarthy <kevin@8t8.us>

Mon, 16 Jul 2018 16:58:43 +0000 (09:58 -0700)

committer Kevin McCarthy <kevin@8t8.us>

Mon, 16 Jul 2018 16:58:43 +0000 (09:58 -0700)
author Kevin McCarthy <kevin@8t8.us>
Mon, 16 Jul 2018 16:58:43 +0000 (09:58 -0700)
committer Kevin McCarthy <kevin@8t8.us>
Mon, 16 Jul 2018 16:58:43 +0000 (09:58 -0700)
diff --cc imap/command.c
Simple merge
diff --cc imap/util.c
Simple merge
diff --cc protos.h
Simple merge
author	Kevin McCarthy <kevin@8t8.us>
	Mon, 16 Jul 2018 16:58:43 +0000 (09:58 -0700)
committer	Kevin McCarthy <kevin@8t8.us>
	Mon, 16 Jul 2018 16:58:43 +0000 (09:58 -0700)
		1	2
imap/command.c	patch \|	diff1 \|	diff2 \|	blob \| history
imap/util.c	patch \|	diff1 \|	diff2 \|	blob \| history
protos.h	patch \|	diff1 \|	diff2 \|	blob \| history