From: Glenn Morris <rgm@gnu.org>
Date: Wed, 23 May 2018 08:35:06 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~5391
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e5ff7f788e8d6e58000a3f8b2a005cb5f5124dd8;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

152a556 (gnus-blocked-images): Clarify privacy implications
---

e5ff7f788e8d6e58000a3f8b2a005cb5f5124dd8