]> granicus.if.org Git - neomutt/commitdiff
merge stable
authorKevin McCarthy <kevin@8t8.us>
Thu, 3 Sep 2015 01:14:26 +0000 (18:14 -0700)
committerKevin McCarthy <kevin@8t8.us>
Thu, 3 Sep 2015 01:14:26 +0000 (18:14 -0700)
1  2 
crypt-gpgme.c

diff --cc crypt-gpgme.c
Simple merge