From: Kevin McCarthy <kevin@8t8.us>
Date: Tue, 21 Jul 2015 19:41:13 +0000 (-0700)
Subject: merge stable
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecbd6cec667ca17e0f5e8a03177109f70a578aae;p=mutt

merge stable
---

ecbd6cec667ca17e0f5e8a03177109f70a578aae