From: Kevin McCarthy <kevin@8t8.us>
Date: Tue, 6 Jan 2015 22:31:48 +0000 (-0800)
Subject: merge stable
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4ea75238d8a54622b74a24bbf79b7e2e69cd9b5;p=neomutt

merge stable
---

e4ea75238d8a54622b74a24bbf79b7e2e69cd9b5