merge stable

author Kevin McCarthy <kevin@8t8.us>

Fri, 28 Apr 2017 04:23:25 +0000 (21:23 -0700)

committer Kevin McCarthy <kevin@8t8.us>

Fri, 28 Apr 2017 04:23:25 +0000 (21:23 -0700)
author Kevin McCarthy <kevin@8t8.us>
Fri, 28 Apr 2017 04:23:25 +0000 (21:23 -0700)
committer Kevin McCarthy <kevin@8t8.us>
Fri, 28 Apr 2017 04:23:25 +0000 (21:23 -0700)
diff --cc curs_lib.c
Simple merge
diff --cc keymap.c
Simple merge
diff --cc mutt_curses.h
Simple merge
author	Kevin McCarthy <kevin@8t8.us>
	Fri, 28 Apr 2017 04:23:25 +0000 (21:23 -0700)
committer	Kevin McCarthy <kevin@8t8.us>
	Fri, 28 Apr 2017 04:23:25 +0000 (21:23 -0700)
		1	2
curs_lib.c	patch \|	diff1 \|	diff2 \|	blob \| history
keymap.c	patch \|	diff1 \|	diff2 \|	blob \| history
mutt_curses.h	patch \|	diff1 \|	diff2 \|	blob \| history