From: Brendan Cully <brendan@kublai.com>
Date: Sun, 7 Sep 2014 19:00:28 +0000 (-0700)
Subject: merge stable
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67bc83288eb4fbcffe936142928e0c33135f9b0c;p=neomutt

merge stable
---

67bc83288eb4fbcffe936142928e0c33135f9b0c