From: Kevin McCarthy <kevin@8t8.us>
Date: Thu, 18 Aug 2016 03:17:50 +0000 (-0700)
Subject: merge default into stable
X-Git-Tag: mutt-1-7-1-rel~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45868a089a08b18d1dff16b041fa09db9dc835da;p=mutt

merge default into stable
---

45868a089a08b18d1dff16b041fa09db9dc835da