From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 9 Dec 2017 09:13:02 +0000 (+0100)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~6463
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=198e0d49d82969d103a520fb1266abba64a26de9;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

4b06af0643 Allow shr to use data: URLs without encoding
---

198e0d49d82969d103a520fb1266abba64a26de9