]> granicus.if.org Git - neomutt/commitdiff
merge stable
authorKevin McCarthy <kevin@8t8.us>
Mon, 27 Mar 2017 18:46:26 +0000 (11:46 -0700)
committerKevin McCarthy <kevin@8t8.us>
Mon, 27 Mar 2017 18:46:26 +0000 (11:46 -0700)
1  2 
init.h

diff --cc init.h
Simple merge