merge: NeoMutt 2018-06-22 neomutt-20180622
authorRichard Russon <rich@flatcap.org>
Fri, 22 Jun 2018 13:11:34 +0000 (14:11 +0100)
committerRichard Russon <rich@flatcap.org>
Fri, 22 Jun 2018 13:11:34 +0000 (14:11 +0100)

Trivial merge