]> granicus.if.org Git - neomutt/commitdiff
merge stable
authorKevin McCarthy <kevin@8t8.us>
Tue, 24 May 2016 19:45:21 +0000 (12:45 -0700)
committerKevin McCarthy <kevin@8t8.us>
Tue, 24 May 2016 19:45:21 +0000 (12:45 -0700)
1  2 
keymap.c

diff --cc keymap.c
Simple merge