From: Richard Russon <rich@flatcap.org>
Date: Sun, 1 May 2016 13:36:19 +0000 (+0100)
Subject: merge: upstream
X-Git-Tag: neomutt-20160530~20^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f920372baa27e2f8a4d10850d6a08546714fa71;p=neomutt

merge: upstream

 * Fix IDNA functions for systems without iconv.
 * Fix mutt_protect() when INLINE is set. (closes #3828)
 * Create a wrapper sys_socket.h to work around Solaris namespace issues.  (closes #3833)
 * automatic post-release commit for mutt-1.6.1
---

4f920372baa27e2f8a4d10850d6a08546714fa71