From: Kevin McCarthy <kevin@8t8.us>
Date: Thu, 18 Aug 2016 03:17:50 +0000 (-0700)
Subject: merge default into stable
X-Git-Tag: neomutt-20160910~12^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b61d44a439a0946397f7534d1b316d503523ed70;p=neomutt

merge default into stable
---

b61d44a439a0946397f7534d1b316d503523ed70