]> granicus.if.org Git - mutt/commitdiff
merge stable
authorKevin McCarthy <kevin@8t8.us>
Mon, 17 Oct 2016 18:23:30 +0000 (11:23 -0700)
committerKevin McCarthy <kevin@8t8.us>
Mon, 17 Oct 2016 18:23:30 +0000 (11:23 -0700)
1  2 
crypt-gpgme.c

diff --cc crypt-gpgme.c
Simple merge