Merge branch 'stable'

author Kevin McCarthy <kevin@8t8.us>

Sun, 7 Jan 2018 00:15:39 +0000 (16:15 -0800)

committer Kevin McCarthy <kevin@8t8.us>

Sun, 7 Jan 2018 00:15:39 +0000 (16:15 -0800)
author Kevin McCarthy <kevin@8t8.us>
Sun, 7 Jan 2018 00:15:39 +0000 (16:15 -0800)
committer Kevin McCarthy <kevin@8t8.us>
Sun, 7 Jan 2018 00:15:39 +0000 (16:15 -0800)
diff --cc imap/command.c
Simple merge
diff --cc imap/imap.c
Simple merge
diff --cc imap/imap_private.h
Simple merge
diff --cc imap/message.c
Simple merge
author	Kevin McCarthy <kevin@8t8.us>
	Sun, 7 Jan 2018 00:15:39 +0000 (16:15 -0800)
committer	Kevin McCarthy <kevin@8t8.us>
	Sun, 7 Jan 2018 00:15:39 +0000 (16:15 -0800)
		1	2
imap/command.c	patch \|	diff1 \|	diff2 \|	blob \| history
imap/imap.c	patch \|	diff1 \|	diff2 \|	blob \| history
imap/imap_private.h	patch \|	diff1 \|	diff2 \|	blob \| history
imap/message.c	patch \|	diff1 \|	diff2 \|	blob \| history