From: Michael Elkins <me@sigpipe.org>
Date: Wed, 23 Oct 2013 18:20:24 +0000 (-0700)
Subject: merge changesets from stable branch
X-Git-Tag: neomutt-20160307~136
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93beca16bfc26e6acd2f89127d17008519bcdb42;p=neomutt

merge changesets from stable branch
---

93beca16bfc26e6acd2f89127d17008519bcdb42