From: Glenn Morris <rgm@gnu.org>
Date: Wed, 15 May 2019 00:18:19 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~2892
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b2c9f638affcbbed171e3381ee523135ee3c31a;p=emacs.git

; Merge from origin/emacs-26

The following commits were skipped:

cf54577 (origin/emacs-26) Backport: fix broken build on m68k
202ff53 Handle GNUTLS_E_AGAIN in emacs_gnutls_read (Bug#34341)
---

4b2c9f638affcbbed171e3381ee523135ee3c31a