From: Kevin McCarthy <kevin@8t8.us>
Date: Fri, 1 Jul 2016 20:39:51 +0000 (-0700)
Subject: merge stable
X-Git-Tag: mutt-1-7-rel~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc14aaee4368093a4e688a685d2e16db99441dbb;p=mutt

merge stable
---

dc14aaee4368093a4e688a685d2e16db99441dbb