From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 19 Mar 2017 19:24:52 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~541
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8893d81fc30c2fd9afceecb4e0325edc9c8b3f50;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

fdef18c Revert "Add DNS keywords and remove duplications"
1cb9aa5 Add DNS keywords and remove duplications
---

8893d81fc30c2fd9afceecb4e0325edc9c8b3f50