From: Kevin McCarthy <kevin@8t8.us>
Date: Mon, 31 Aug 2015 16:32:04 +0000 (-0700)
Subject: merge default into stable
X-Git-Tag: neomutt-20160404~121^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1191279a2a05c81a3b5d24d77a652ff3c2a9a933;p=neomutt

merge default into stable
---

1191279a2a05c81a3b5d24d77a652ff3c2a9a933